diff --git a/.clang-format b/.clang-format
index 44397b42f..6c11f9aa6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,4 @@
 BasedOnStyle: Google
 IndentWidth: 4
 AccessModifierOffset: -4
-SortIncludes: false # FIXME: https://github.com/4jcraft/4jcraft/issues/225
\ No newline at end of file
+# SortIncludes: false # FIXME: https://github.com/4jcraft/4jcraft/issues/225
\ No newline at end of file
diff --git a/targets/4J.Input/4J_Input.cpp b/targets/4J.Input/4J_Input.cpp
index e0e0beece..ec298c687 100644
--- a/targets/4J.Input/4J_Input.cpp
+++ b/targets/4J.Input/4J_Input.cpp
@@ -1,11 +1,14 @@
 #include "4J_Input.h"
-#include "../4J.Common/4J_InputActions.h"
+
 #include <SDL2/SDL.h>
 #include <math.h>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
 #include <string>
 
+#include "../4J.Common/4J_InputActions.h"
+
 C_4JInput InputManager;
 
 static const int KEY_COUNT = SDL_NUM_SCANCODES;
diff --git a/targets/4J.Profile/4J_Profile.cpp b/targets/4J.Profile/4J_Profile.cpp
index 6e391dd0a..54109b15c 100644
--- a/targets/4J.Profile/4J_Profile.cpp
+++ b/targets/4J.Profile/4J_Profile.cpp
@@ -1,9 +1,11 @@
 #include "4J_Profile.h"
-#include "../4J.Common/4J_ProfileConstants.h"
-#include "../4J.Input/4J_Input.h"
+
 #include <cstdio>
 #include <cstring>
 
+#include "../4J.Common/4J_ProfileConstants.h"
+#include "../4J.Input/4J_Input.h"
+
 C_4JProfile ProfileManager;
 
 namespace {
diff --git a/targets/4J.Render/4J_Render.cpp b/targets/4J.Render/4J_Render.cpp
index bf5c153b3..ee3172e5c 100644
--- a/targets/4J.Render/4J_Render.cpp
+++ b/targets/4J.Render/4J_Render.cpp
@@ -1,6 +1,7 @@
-#include "gl3_loader.h"
 #include "4J_Render.h"
 
+#include "gl3_loader.h"
+
 // undefine macros from header to avoid argument mismatch
 #undef glGenTextures
 #undef glDeleteTextures
@@ -21,18 +22,18 @@
 #include "stb_image.h"
 
 #define GLM_FORCE_RADIANS
+#include <dlfcn.h>
+#include <pthread.h>
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
-
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
-#include <cassert>
 #include <unordered_map>
 #include <vector>
-#include <pthread.h>
-#include <dlfcn.h>
 
 C4JRender RenderManager;
 
diff --git a/targets/4J.Render/4J_Render.h b/targets/4J.Render/4J_Render.h
index 29c5ebdfb..d4a2c2d8c 100644
--- a/targets/4J.Render/4J_Render.h
+++ b/targets/4J.Render/4J_Render.h
@@ -3,12 +3,12 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include "../platform/IPlatformRender.h"
-
-#ifdef __linux__
+#include "gl3_loader.h"
+// NOTE: gl3_loader.h must be included before these two
 #include <GL/gl.h>
 #include <GL/glu.h>
-#endif
+
+#include "../platform/IPlatformRender.h"
 
 class C4JRender : public IPlatformRender {
 public:
diff --git a/targets/4J.Render/gl3_loader.h b/targets/4J.Render/gl3_loader.h
index 55991d6be..6416a1152 100644
--- a/targets/4J.Render/gl3_loader.h
+++ b/targets/4J.Render/gl3_loader.h
@@ -5,6 +5,7 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <SDL2/SDL.h>
+
 #include <cstdio>
 #ifndef GL_ARRAY_BUFFER
 #define GL_ARRAY_BUFFER 0x8892
diff --git a/targets/4J.Render/stb_image.h b/targets/4J.Render/stb_image.h
index 401a2d65e..bc4eab192 100644
--- a/targets/4J.Render/stb_image.h
+++ b/targets/4J.Render/stb_image.h
@@ -628,11 +628,11 @@ STBIDEF int stbi_zlib_decode_noheader_buffer(char* obuffer, int olen,
 #define STBI_NO_ZLIB
 #endif
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>  // ptrdiff_t on osx
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
 #include <math.h>  // ldexp, pow
diff --git a/targets/4J.Storage/4J_Storage.cpp b/targets/4J.Storage/4J_Storage.cpp
index 4d0f52962..37b9d7630 100644
--- a/targets/4J.Storage/4J_Storage.cpp
+++ b/targets/4J.Storage/4J_Storage.cpp
@@ -1,7 +1,8 @@
 #include "4J_Storage.h"
+
 #include <cstring>
-#include <vector>
 #include <string>
+#include <vector>
 
 C4JStorage StorageManager;
 
diff --git a/targets/Minecraft.Client/Common/App_structs.h b/targets/Minecraft.Client/Common/App_structs.h
index 074c72339..87bed6f3f 100644
--- a/targets/Minecraft.Client/Common/App_structs.h
+++ b/targets/Minecraft.Client/Common/App_structs.h
@@ -3,12 +3,13 @@
 #include <cstdint>
 
 #include "4J.Storage/4J_Storage.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/App_Defines.h"
+#include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 typedef struct {
     wchar_t* wchFilename;
diff --git a/targets/Minecraft.Client/Common/Consoles_App.cpp b/targets/Minecraft.Client/Common/Consoles_App.cpp
index b2edfe4b6..f66a1469e 100644
--- a/targets/Minecraft.Client/Common/Consoles_App.cpp
+++ b/targets/Minecraft.Client/Common/Consoles_App.cpp
@@ -1,70 +1,71 @@
-#include "minecraft/world/item/crafting/Recipy.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
+#include "console_helpers/PathHelper.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
-#include "minecraft/world/Container.h"
-#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
-#include "minecraft/world/level/tile/entity/SignTileEntity.h"
-#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
-#include "console_helpers/PathHelper.h"
-#include "minecraft/stats/StatsCounter.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/level/GameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "minecraft/stats/StatsCounter.h"
+#include "minecraft/world/Container.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/item/crafting/Recipy.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
+#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
+#include "minecraft/world/level/tile/entity/SignTileEntity.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
-#include "console_helpers/PlatformTime.h"
-#include "Minecraft_Macros.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "minecraft/world/level/LevelSettings.h"
-#include "minecraft/client/User.h"
 #include <cstring>
-#include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "console_helpers/compression.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "console_helpers/StringHelpers.h"
 
 #include "4J_Input.h"
-#include "minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
+#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
+#include "Minecraft_Macros.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "java/InputOutputStream/InputOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 #if defined(__linux__)
 #include <unistd.h>
+
 #include <climits>
 #endif
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-
-#include <thread>
 #include <chrono>
+#include <thread>
+
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
 
 // CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
diff --git a/targets/Minecraft.Client/Common/Consoles_App.h b/targets/Minecraft.Client/Common/Consoles_App.h
index cdda8ba22..e08de0826 100644
--- a/targets/Minecraft.Client/Common/Consoles_App.h
+++ b/targets/Minecraft.Client/Common/Consoles_App.h
@@ -3,29 +3,25 @@
 #include <cstdint>
 #include <mutex>
 
-#include "4J.Storage/4J_Storage.h"
 #include "4J.Profile/4J_Profile.h"
+#include "4J.Storage/4J_Storage.h"
 
 // using namespace std;
 
+#include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-
-#include "minecraft/network/packet/DisconnectPacket.h"
-
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
-#include "minecraft/world/entity/item/MinecartHopper.h"
-#include "Minecraft.Client/Common/App_structs.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/world/entity/item/MinecartHopper.h"
 
 typedef struct _JoinFromInviteData {
     std::uint32_t dwUserIndex;       // dwUserIndex
diff --git a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp b/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp
index 6c89ddf2d..0a7949a1f 100644
--- a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp
+++ b/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp
@@ -1,4 +1,5 @@
 #include "Consoles_SoundEngine.h"
+
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
 
 bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {
diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
index 194a5e00c..c84959936 100644
--- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
+++ b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
@@ -1,29 +1,30 @@
-#include <ctype.h>
+#include "SoundEngine.h"
+
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
+
 #include <cmath>
 #include <cstdlib>
+#include <filesystem>
 #include <initializer_list>
 #include <memory>
 #include <vector>
 
-#include "SoundEngine.h"
-#include <filesystem>
-#include "console_helpers/PathHelper.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/C4JThread.h"
-#include "minecraft/world/entity/Mob.h"
+#include "console_helpers/PathHelper.h"
 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 #if defined(__linux__)
 #define STB_VORBIS_HEADER_ONLY
@@ -57,8 +58,8 @@ int strcasecmp(const char* a, const char* b) {
 #undef FALSE
 #endif
 #if defined(_WINDOWS64)
-#include "Minecraft.Client/Windows64/Windows64_App.h"
 #include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
+#include "Minecraft.Client/Windows64/Windows64_App.h"
 #endif
 
 // ASSETS
diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h
index 8f16ba231..7b794afdf 100644
--- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h
+++ b/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h
@@ -7,11 +7,11 @@ class Random;
 using namespace std;
 #include <string>
 
-#include "minecraft/sounds/SoundTypes.h"
-#include "miniaudio.h"
 #include "Minecraft.Client/Common/App_Defines.h"
 #include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "miniaudio.h"
 
 constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
 constexpr float SFX_3D_MAX_DISTANCE = 16.0f;
diff --git a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp b/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
index 7a9f163af..018854493 100644
--- a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
+++ b/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
@@ -1,13 +1,14 @@
+#include "ColourTable.h"
+
+#include <cstring>
 #include <utility>
 #include <vector>
-#include <cstring>
 
-#include "ColourTable.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 
diff --git a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp b/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp
index 3833eea10..29ef6ac01 100644
--- a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp
+++ b/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp
@@ -1,6 +1,7 @@
 #include "ConsoleGameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+
 #include "Minecraft.Client/Common/src/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 
 class ClientConnection;
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
index d73f732ab..54b4f2b67 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
@@ -1,17 +1,18 @@
+#include "DLCAudioFile.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <unordered_map>
 
-#include "DLCManager.h"
-#include "DLCAudioFile.h"
 #include "4J.Render/4J_Render.h"
 #include "4J_Storage.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp
index 906737f28..33e73e83a 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp
@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCCapeFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
index ae3c9f4af..2c1ebb236 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
@@ -1,11 +1,12 @@
-#include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 
 DLCColourTableFile::DLCColourTableFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_ColourTable, path) {
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp
index 899172794..c52084f1b 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp
@@ -1,6 +1,7 @@
+#include "DLCFile.h"
+
 #include <sstream>
 
-#include "DLCFile.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp
index 109588622..83c235f9d 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp
@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCGameRulesFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
 
 DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path)
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
index f79d531ab..74b4c2144 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
@@ -1,9 +1,10 @@
+#include "DLCGameRulesHeader.h"
+
 #include <string>
 
 #include "DLCManager.h"
-#include "DLCGameRulesHeader.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp
index 784a0bf98..39009c54e 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp
@@ -1,7 +1,8 @@
-#include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_LocalisationData, path) {
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
index 8574c9b35..1517d8582 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@@ -1,19 +1,20 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include <cassert>
-#include <algorithm>
 #include "DLCManager.h"
-#include "DLCPack.h"
-#include "DLCFile.h"
-#include "console_helpers/StringHelpers.h"
-#include "console_helpers/PortableFileIO.h"
-#include "Minecraft.Client/Common/src/UI/UIController.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include <cstring>
-#include <limits>
+
+#include <algorithm>
+#include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <limits>
+
+#include "DLCFile.h"
+#include "DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/UIController.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 
 // 4jcraft, this is the size of wchar_t on disk
 // the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.h b/targets/Minecraft.Client/Common/src/DLC/DLCManager.h
index b1d3aaf45..d651e4cfd 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.h
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCManager.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 #include <cstdint>
-#include <vector>
 #include <string>
+#include <vector>
 class DLCPack;
 class DLCSkinFile;
 
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
index a38913ffc..93ea261b0 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
@@ -1,27 +1,29 @@
+#include "DLCPack.h"
+
 #include <wchar.h>
+
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
-#include "DLCPack.h"
-#include "DLCSkinFile.h"
+#include "4J_Profile.h"
+#include "DLCAudioFile.h"
 #include "DLCCapeFile.h"
-#include "DLCTextureFile.h"
-#include "DLCUIDataFile.h"
-#include "DLCLocalisationFile.h"
+#include "DLCColourTableFile.h"
 #include "DLCGameRulesFile.h"
 #include "DLCGameRulesHeader.h"
-#include "DLCAudioFile.h"
-#include "DLCColourTableFile.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "4J_Profile.h"
+#include "DLCLocalisationFile.h"
+#include "DLCSkinFile.h"
+#include "DLCTextureFile.h"
+#include "DLCUIDataFile.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/StringHelpers.h"
 
 DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
     m_dataPath = L"";
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.h b/targets/Minecraft.Client/Common/src/DLC/DLCPack.h
index 313353efd..ffb266a61 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.h
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCPack.h
@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "DLCManager.h"
 #include "4J.Common/4J_Compat.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 
 class DLCFile;
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
index 31cd763d3..9a4d3987a 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
@@ -1,15 +1,16 @@
+#include "DLCSkinFile.h"
+
 #include <wchar.h>
 
-#include "DLCManager.h"
-#include "DLCSkinFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "4J.Render/4J_Render.h"
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
index b16b4a1b4..0027ce59c 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
@@ -5,9 +5,9 @@
 #include <vector>
 
 #include "DLCFile.h"
-#include "minecraft/client/model/HumanoidModel.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/client/model/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile {
 private:
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp
index 76974d6fa..096cd8970 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp
@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCTextureFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 
 DLCTextureFile::DLCTextureFile(const std::wstring& path)
diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp b/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp
index e1123b868..3175d72b6 100644
--- a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp
+++ b/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp
@@ -1,5 +1,6 @@
-#include "DLCManager.h"
 #include "DLCUIDataFile.h"
+
+#include "DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
diff --git a/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h b/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h
index 2e11934c3..268f37adb 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h
@@ -1,32 +1,25 @@
 #pragma once
 #include "ConsoleGameRulesConstants.h"
-
 #include "GameRuleManager.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
-
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
-
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
index 10b4c0c3b..ccf6bf80d 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
@@ -1,17 +1,17 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "console_helpers/compression.h"
-#include "console_helpers/StringHelpers.h"
-#include "java/File.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 
+#include "ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "java/File.h"
+
 const wchar_t* GameRuleManager::wchTagNameA[] = {
     L"",                   // eGameRuleType_Root
     L"MapOptions",         // eGameRuleType_LevelGenerationOptions
diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
index 2c7bffe83..bf4f953c6 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
@@ -1,9 +1,9 @@
 #pragma once
 ////using namespace std;
 
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
 
 class LevelGenerationOptions;
 class RootGameRulesDefinition;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
index 14d6682e8..55871d72b 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@@ -1,21 +1,22 @@
+#include "ApplySchematicRuleDefinition.h"
+
 #include <algorithm>
 #include <cmath>
 
-#include "console_helpers/StringHelpers.h"
-#include "ApplySchematicRuleDefinition.h"
-#include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
-#include "minecraft/world/phys/AABB.h"
+#include "LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/phys/AABB.h"
 
 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
     LevelGenerationOptions* levelGenOptions) {
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
index 979ae67e0..f2ca030b6 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
@@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <optional>
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "ConsoleSchematicFile.h"
-#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
 class AABB;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
index 6fbbb2cf4..c5deab5d0 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "BiomeOverride.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 BiomeOverride::BiomeOverride() {
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h
index 57bd3a2a1..76218f71d 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 
 class BiomeOverride : public GameRuleDefinition {
 private:
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
index 6db3b8512..041bb3ff4 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@@ -1,8 +1,9 @@
+#include "ConsoleGenerateStructure.h"
+
 #include <wchar.h>
+
 #include <algorithm>
 
-#include "ConsoleGenerateStructure.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
@@ -11,11 +12,12 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
     m_x = m_y = m_z = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h
index f6189a46e..501dc5bb6 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h
@@ -2,10 +2,10 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 class Level;
 class Random;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
index 741f1f476..b1fa65daa 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
@@ -1,13 +1,21 @@
+#include "ConsoleSchematicFile.h"
+
 #include <assert.h>
 #include <string.h>
-#include <vector>
+
 #include <algorithm>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
-#include "ConsoleSchematicFile.h"
-#include "console_helpers/compression.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/compression.h"
+#include "java/Class.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/ItemFrame.h"
@@ -19,12 +27,6 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Class.h"
-#include "java/InputOutputStream/DataInputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/DoubleTag.h"
 #include "nbt/IntTag.h"
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
index 111e4f383..0b754824b 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
@@ -5,6 +5,7 @@
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <ranges>
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
index d92049934..e3ce74fa3 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@@ -1,23 +1,22 @@
-#include <fstream>
+#include "LevelGenerationOptions.h"
+
 #include <filesystem>
+#include <fstream>
 #include <unordered_set>
 
+#include "4J_Storage.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/stdafx.h"
-
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/Pos.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "LevelGenerationOptions.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-
-#include "4J_Storage.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
 
 JustGrSource::JustGrSource() {
     m_displayName = L"Default_DisplayName";
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
index 1cb35dec6..d54f1764e 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
@@ -5,11 +5,10 @@
 
 #include <cstdint>
 
-#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
-
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp
index cf1262b12..80a8ef3b0 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp
@@ -1,7 +1,8 @@
+#include "LevelGenerators.h"
+
 #include <algorithm>
 
 #include "LevelGenerationOptions.h"
-#include "LevelGenerators.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
 
 LevelGenerators::LevelGenerators() {}
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
index 6320572cb..74ee2a363 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "StartFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 StartFeature::StartFeature() {
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h
index 104b2dfaf..e2d3ce1a9 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h
@@ -3,9 +3,9 @@
 
 #include <string>
 
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 
 class StartFeature : public GameRuleDefinition {
 private:
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
index 2ee40b431..84d8383cf 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@@ -1,11 +1,12 @@
 #include "XboxStructureActionGenerateBox.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {
     m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
index ebecae2c7..a07939229 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
index 1aaf30909..bc8bddeb8 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@@ -1,11 +1,12 @@
 #include "XboxStructureActionPlaceBlock.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {
     m_x = m_y = m_z = m_tile = m_data = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
index 8a6fb8a51..7fdeec035 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 
 class StructurePiece;
 class Level;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
index 056680269..8b2419765 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
@@ -1,12 +1,14 @@
+#include "XboxStructureActionPlaceContainer.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "console_helpers/StringHelpers.h"
-#include "XboxStructureActionPlaceContainer.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
index 3766b39e7..279c95b5e 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 
-#include "XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "XboxStructureActionPlaceBlock.h"
 
 class AddItemRuleDefinition;
 class StructurePiece;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
index 60f79a334..2cff8b3fb 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
@@ -1,15 +1,17 @@
+#include "XboxStructureActionPlaceSpawner.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "XboxStructureActionPlaceSpawner.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {
     m_tile = Tile::mobSpawner_Id;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
index 19b572c79..ed73e5c89 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "XboxStructureActionPlaceBlock.h"
 
 class StructurePiece;
 class Level;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp
index eaac5c289..1e03d7b23 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp
@@ -1,4 +1,5 @@
 #include "LevelRules.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
 
 LevelRules::LevelRules() {}
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
index df8d10f40..1e3cdc3c5 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@@ -1,18 +1,19 @@
+#include "AddEnchantmentRuleDefinition.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"
-#include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentCategory.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {
     m_enchantmentId = m_enchantmentLevel = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
index 0ccebf182..11c7612ce 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@@ -1,15 +1,16 @@
+#include "AddItemRuleDefinition.h"
+
 #include <algorithm>
 
-#include "console_helpers/StringHelpers.h"
-#include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 AddItemRuleDefinition::AddItemRuleDefinition() {
     m_itemId = m_quantity = m_auxValue = m_dataTag = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
index df4dac2c6..a62e37786 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@@ -1,13 +1,14 @@
-#include "console_helpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "minecraft/network/Connection.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition() {
     m_itemId = 0;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
index b04078ec2..648409cf2 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@@ -1,15 +1,16 @@
+#include "CompleteAllRuleDefinition.h"
+
 #include <memory>
 #include <unordered_map>
 #include <utility>
 
-#include "CompleteAllRuleDefinition.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
 
 void CompleteAllRuleDefinition::getChildren(
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
index a2f6c8170..4d56973c3 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@@ -1,17 +1,19 @@
+#include "CompoundGameRuleDefinition.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include "console_helpers/StringHelpers.h"
-#include "CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
+#include "console_helpers/StringHelpers.h"
 
 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
     m_lastRuleStatusChanged = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
index 6b7e07cff..5ba6d6a58 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@@ -1,19 +1,21 @@
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+
 #include <assert.h>
 #include <wchar.h>
+
 #include <format>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 class Connection;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
index 6996580b3..f385ed11c 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
@@ -1,13 +1,13 @@
 #pragma once
 // using namespace std;
-#include <unordered_map>
-#include <string>
 #include <format>
 #include <memory>
+#include <string>
+#include <unordered_map>
 
-#include "minecraft/world/item/ItemInstance.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class GameRule;
 class LevelRuleset;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
index da5e200ae..8998178c3 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
@@ -1,8 +1,9 @@
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "LevelRuleset.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 
 class AABB;
 
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
index 6a7c71c9f..7ed5c479d 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@@ -1,10 +1,11 @@
+#include "NamedAreaRuleDefinition.h"
+
 #include <wchar.h>
 
-#include "NamedAreaRuleDefinition.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition() {
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
index 667da161c..fec1d6674 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
@@ -3,8 +3,8 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/phys/AABB.h"
 
 class NamedAreaRuleDefinition : public GameRuleDefinition {
 private:
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
index 2ae159b7d..0b28964c8 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@@ -1,17 +1,19 @@
+#include "UpdatePlayerRuleDefinition.h"
+
 #include <wchar.h>
+
 #include <memory>
 
-#include "UpdatePlayerRuleDefinition.h"
-#include "minecraft/Pos.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/Pos.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodData.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
     m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
index 4b76532ed..9bb1ef2dc 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@@ -1,8 +1,9 @@
-#include "console_helpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition() {
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
index 4e6194495..cbcba9611 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
@@ -4,8 +4,8 @@
 #include <string>
 
 #include "GameRuleDefinition.h"
-#include "minecraft/Pos.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/Pos.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition {
 private:
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp
index a1aa48850..7f8a0a302 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp
@@ -1,12 +1,14 @@
 
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
index 00c686c73..193dcc2e2 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
@@ -2,9 +2,10 @@
 // using namespace std;
 
 #include <stdint.h>
-#include <unordered_map>
+
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 class CompoundTag;
 class GameRuleDefinition;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h
index 93f3e28cd..b3390636c 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h
+++ b/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h
@@ -1,6 +1,7 @@
 #pragma once
 // using namespace std;
 #include <vector>
+
 #include "GameRule.h"
 
 class GameRuleDefinition;
diff --git a/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp b/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp
index a2071ca68..dc0a4113f 100644
--- a/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp
+++ b/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp
@@ -1,8 +1,8 @@
 
-#include <utility>
-
 #include "WstringLookup.h"
 
+#include <utility>
+
 WstringLookup::WstringLookup() { numIDs = 0; }
 
 std::wstring WstringLookup::lookup(unsigned int id) {
diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp
index 286dd5130..f530c9234 100644
--- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp
+++ b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp
@@ -1,6 +1,7 @@
+#include "LeaderboardInterface.h"
+
 #include <assert.h>
 
-#include "LeaderboardInterface.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 
 LeaderboardInterface::LeaderboardInterface(LeaderboardManager* man) {
diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h
index 98827f23d..53ac5133a 100644
--- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h
+++ b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "LeaderboardManager.h"
 #include "4J.Common/4J_Compat.h"
+#include "LeaderboardManager.h"
 
 // 4J-JEV: Simple interface for handling ReadStat failures.
 class LeaderboardInterface {
diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
index 7bd8f80e2..0da0134de 100644
--- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
+++ b/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
@@ -1,9 +1,10 @@
-#include "console_helpers/StringHelpers.h"
 #include "LeaderboardManager.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 
 const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {
     L"Friends", L"MyScore", L"TopRank"};
diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/base64.h b/targets/Minecraft.Client/Common/src/Leaderboards/base64.h
index 315f4c358..f09a92e66 100644
--- a/targets/Minecraft.Client/Common/src/Leaderboards/base64.h
+++ b/targets/Minecraft.Client/Common/src/Leaderboards/base64.h
@@ -7,6 +7,7 @@
 #define BASE64_H_C0CE2A47_D10E_42C9_A27C_C883944E704A
 
 #include <stddef.h>
+
 #include <string>
 
 #if __cplusplus >= 201703L
diff --git a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp b/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp
index 22a9ff57f..7aed83a75 100644
--- a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp
+++ b/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp
@@ -1,7 +1,8 @@
+#include "StringTable.h"
+
 #include <ranges>
 #include <utility>
 
-#include "StringTable.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
index 6ae2c9ad0..942c6250e 100644
--- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
@@ -1,42 +1,40 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "GameNetworkManager.h"
 
-#include <thread>
 #include <chrono>
-#include <fstream>
 #include <filesystem>
+#include <fstream>
+#include <thread>
 
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/Vec3.h"
+#include "4J_Input.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "Socket.h"
+#include "console_helpers/StringHelpers.h"
 #include "console_helpers/ThreadName.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/item/crafting/FireworksRecipe.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "console_helpers/compression.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/User.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/PlayerList.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/network/packet/DisconnectPacket.h"
-#include "console_helpers/compression.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/item/crafting/FireworksRecipe.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "GameNetworkManager.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-#include "4J_Input.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 
 // Global instance
 CGameNetworkManager g_NetworkManager;
diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
index 334e88d2b..e435d9a8e 100644
--- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
+++ b/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
@@ -4,10 +4,10 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
+#include "console_helpers/C4JThread.h"
 
 class ClientConnection;
 class Minecraft;
diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h
index b80be0818..19163b7d5 100644
--- a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h
+++ b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 class Socket;
 
 // This is the platform independent interface for dealing with players within a
diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp
index 9ba1a67b1..56bd08722 100644
--- a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp
@@ -3,8 +3,8 @@
 #include <limits.h>
 
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/System.h"
 
 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {
diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h
index 7bc684c98..dcf095603 100644
--- a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h
+++ b/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <string>
 
-#include "NetworkPlayerInterface.h"
 #include "4J.Common/4J_Compat.h"
+#include "NetworkPlayerInterface.h"
 
 class IQNetPlayer;
 class Socket;
diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
index 2db2a2ab7..9593e498f 100644
--- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
+++ b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
@@ -4,12 +4,12 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
+#include "console_helpers/C4JThread.h"
 
 class ClientConnection;
 class Minecraft;
diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
index 34aca33ed..0c11914c9 100644
--- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
@@ -1,14 +1,16 @@
+#include "PlatformNetworkManagerStub.h"
+
 #include <string.h>
 #include <wchar.h>
+
 #include <compare>
 
-#include "Socket.h"
-#include "NetworkPlayerQNet.h"
-#include "PlatformNetworkManagerStub.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "NetworkPlayerQNet.h"
+#include "Socket.h"
 #include "console_helpers/C4JThread.h"
 
 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;
diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
index 516abc754..66e9e9ad8 100644
--- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
+++ b/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
@@ -1,17 +1,17 @@
 #pragma once
 #include <stdint.h>
 // using namespace std;
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "console_helpers/C4JThread.h"
+#include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
-#include "4J.Common/4J_Compat.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "console_helpers/C4JThread.h"
 
 class C4JThread;
 class CGameNetworkManager;
diff --git a/targets/Minecraft.Client/Common/src/Network/SessionInfo.h b/targets/Minecraft.Client/Common/src/Network/SessionInfo.h
index 22f55e495..b53f54c24 100644
--- a/targets/Minecraft.Client/Common/src/Network/SessionInfo.h
+++ b/targets/Minecraft.Client/Common/src/Network/SessionInfo.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/include/NetTypes.h"
+
 // A struct that we store in the QoS data when we are hosting the session. Max
 // size 1020 bytes.
 typedef struct _GameSessionData {
diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.cpp b/targets/Minecraft.Client/Common/src/Network/Socket.cpp
index 9ef70c367..e302f47a6 100644
--- a/targets/Minecraft.Client/Common/src/Network/Socket.cpp
+++ b/targets/Minecraft.Client/Common/src/Network/Socket.cpp
@@ -1,17 +1,18 @@
-#include <stdio.h>
-#include <thread>
-#include <chrono>
-#include <vector>
-
 #include "Socket.h"
+
+#include <stdio.h>
+
+#include <chrono>
+#include <thread>
+#include <vector>
 // 4jcraft TODO
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "minecraft/server/network/ServerConnection.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "minecraft/server/network/ServerConnection.h"
 
 class SocketAddress {};
 
diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.h b/targets/Minecraft.Client/Common/src/Network/Socket.h
index 6ae80c218..fe89f6b67 100644
--- a/targets/Minecraft.Client/Common/src/Network/Socket.h
+++ b/targets/Minecraft.Client/Common/src/Network/Socket.h
@@ -3,18 +3,18 @@
 #include <cstdint>
 #include <format>
 #ifndef __linux__
-#include <xrnm.h>
 #include <qnet.h>
+#include <xrnm.h>
 #endif
 #include <mutex>
 #include <queue>
 
-#include "java/InputOutputStream/InputStream.h"
-#include "java/InputOutputStream/OutputStream.h"
+#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "console_helpers/C4JThread.h"   // 4jcraft TODO
 #include "console_helpers/ThreadName.h"  // 4jcraft TODO
-#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
-#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "java/InputOutputStream/InputStream.h"
+#include "java/InputOutputStream/OutputStream.h"
 
 class INetworkPlayer;
 
diff --git a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp b/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp
index 4eddcbee4..dd17a0d46 100644
--- a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp
+++ b/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp
@@ -1,6 +1,7 @@
 #include "TrialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h"
+
 #include "Minecraft.Client/Common/src/Trial/TrialMode.h"
+#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 
 class ClientConnection;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
index 09db192ab..c0992c8f7 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
@@ -1,10 +1,11 @@
+#include "AreaConstraint.h"
+
 #include <memory>
 
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "AreaConstraint.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "minecraft/world/phys/Vec3.h"
 
 AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
index bcff79946..b8fb0c241 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
@@ -1,18 +1,19 @@
+#include "ChangeStateConstraint.h"
+
 #include <memory>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "ChangeStateConstraint.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/PlayerInfoPacket.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
 ChangeStateConstraint::ChangeStateConstraint(
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp
index e0ce9afbd..f45233341 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp
@@ -1,6 +1,7 @@
 #include "InputConstraint.h"
-#include "4J_Input.h"
+
 #include "4J.Common/4J_InputActions.h"
+#include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
 
 bool InputConstraint::isMappingConstrained(int iPad, int mapping) {
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h
index 87619a857..fe205b2f3 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "TutorialConstraint.h"
 #include "AreaConstraint.h"
 #include "ChangeStateConstraint.h"
-#include "InputConstraint.h"
\ No newline at end of file
+#include "InputConstraint.h"
+#include "TutorialConstraint.h"
\ No newline at end of file
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
index b37731e7d..8ae9af1da 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
@@ -1,19 +1,18 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "FullTutorial.h"
 
 #include "4J.Common/4J_InputActions.h"
-
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
-#include "FullTutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
 
 FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
     : Tutorial(iPad, true) {
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
index d6335fb53..4306b7b45 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
@@ -1,9 +1,10 @@
-#include "minecraft/client/Minecraft.h"
-#include "FullTutorial.h"
 #include "FullTutorialMode.h"
+
+#include "FullTutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "minecraft/client/Minecraft.h"
 
 class ClientConnection;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
index 3c451dcda..d26b599df 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
@@ -1,11 +1,12 @@
+#include "AreaHint.h"
+
 #include <memory>
 
+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "AreaHint.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
 #include "minecraft/world/phys/Vec3.h"
 
 AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h
index 47151989b..7689661d4 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"
 #include "minecraft/world/phys/AABB.h"
 
 class AABB;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
index 508748faa..18da2a552 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
@@ -1,10 +1,11 @@
 
+#include "DiggerItemHint.h"
+
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "DiggerItemHint.h"
 
 DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial,
                                int descriptionId, int items[],
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
index f00abe25b..3517053f0 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
@@ -1,6 +1,7 @@
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "LookAtEntityHint.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial,
                                    int descriptionId, int titleId,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h
index 4aade18f4..ecced69af 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h
@@ -1,9 +1,9 @@
 #pragma once
 // using namespace std;
 
-#include "java/Class.h"
-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"
+#include "java/Class.h"
 
 class ItemInstance;
 class Tutorial;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
index 27d7fbb63..1ac51a7c3 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
@@ -1,8 +1,9 @@
+#include "LookAtTileHint.h"
+
 #include <vector>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "LookAtTileHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/world/item/Item.h"
 
 LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h
index 948e280a0..6c0df16d0 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"
 
 class ItemInstance;
 class Tutorial;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
index 1602d628f..b9d2f29ae 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
@@ -1,8 +1,9 @@
+#include "TakeItemHint.h"
+
 #include <memory>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "TakeItemHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/world/item/ItemInstance.h"
 
 TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[],
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h
index 874315cb8..b72aa48d5 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "TutorialHint.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialHint.h"
 
 class ItemInstance;
 class Tutorial;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
index 3012fd3b3..0c4217e59 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
@@ -1,9 +1,10 @@
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "TutorialHint.h"
+
+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "minecraft/world/level/material/Material.h"
 
 class Entity;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h
index 5c7381ab0..f9ceb441d 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h
@@ -2,6 +2,6 @@
 
 #include "AreaHint.h"
 #include "DiggerItemHint.h"
+#include "LookAtEntityHint.h"
 #include "LookAtTileHint.h"
-#include "TakeItemHint.h"
-#include "LookAtEntityHint.h"
\ No newline at end of file
+#include "TakeItemHint.h"
\ No newline at end of file
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
index 1a58676db..b90103a7b 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
@@ -1,9 +1,10 @@
+#include "AreaTask.h"
+
 #include <vector>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "AreaTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial,
                    std::vector<TutorialConstraint*>* inConstraints,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h
index 858927c74..8ea5cc20f 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h
@@ -3,8 +3,8 @@
 
 #include <format>
 
-#include "TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialTask.h"
 
 class Tutorial;
 class TutorialConstraint;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
index 99cb8b1c1..c2ba8a802 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
@@ -1,15 +1,16 @@
+#include "ChoiceTask.h"
+
 #include <memory>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "ChoiceTask.h"
-#include "minecraft/world/level/material/Material.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/world/level/material/Material.h"
 
 ChoiceTask::ChoiceTask(
     Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h
index f5ea3ee43..61ebcc9b0 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialTask.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
index ceda9381a..911c833c2 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
@@ -1,8 +1,9 @@
+#include "CompleteUsingItemTask.h"
+
 #include <memory>
 
-#include "minecraft/world/item/ItemInstance.h"
-#include "CompleteUsingItemTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
index ad1892554..20b43e774 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
@@ -1,17 +1,18 @@
-#include <unordered_map>
+#include "ControllerTask.h"
+
 #include <cmath>
 #include <memory>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "ControllerTask.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
index 780dfe75f..45a240f0b 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
@@ -1,8 +1,10 @@
+#include "CraftTask.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <string>
 
-#include "CraftTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "minecraft/world/item/ItemInstance.h"
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp
index 90595c3d8..30cb8cba5 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp
@@ -1,4 +1,5 @@
 #include "EffectChangedTask.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 
 class Tutorial;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
index 77c328a94..d3fe0e43e 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
@@ -1,6 +1,7 @@
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "FullTutorialActiveTask.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 FullTutorialActiveTask::FullTutorialActiveTask(
     Tutorial* tutorial,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h
index beef693ee..0d0f04ed0 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialTask.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
index e15d76561..5e186f5a3 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
@@ -1,10 +1,11 @@
+#include "HorseChoiceTask.h"
+
 #include <memory>
 
-#include "minecraft/world/entity/animal/EntityHorse.h"
-#include "HorseChoiceTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
index 909fa666e..06d8694bd 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
@@ -1,17 +1,18 @@
-#include <unordered_map>
+#include "InfoTask.h"
+
 #include <memory>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "InfoTask.h"
-#include "minecraft/world/level/material/Material.h"
 #include "4J_Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/world/level/material/Material.h"
 
 InfoTask::InfoTask(Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
                    bool requiresUserInput /*= false*/, int iMapping /*= 0*/)
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp
index 90e2335ee..d4a392ff9 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp
@@ -1,6 +1,7 @@
+#include "PickupTask.h"
+
 #include <memory>
 
-#include "PickupTask.h"
 #include "minecraft/world/item/ItemInstance.h"
 
 void PickupTask::onTake(std::shared_ptr<ItemInstance> item,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp
index 7df3a06cd..1f9970de6 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp
@@ -1,7 +1,8 @@
+#include "ProcedureCompoundTask.h"
+
 #include <compare>
 #include <memory>
 
-#include "ProcedureCompoundTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 
 ProcedureCompoundTask::~ProcedureCompoundTask() {
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h
index f48f8166c..eac49f78e 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "TutorialTask.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
index 40e27aae4..c7f4f1158 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
@@ -1,9 +1,10 @@
+#include "RideEntityTask.h"
+
 #include <memory>
 
-#include "RideEntityTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/Entity.h"
 
 class Tutorial;
 class TutorialConstraint;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
index 1f2941129..74a6cb989 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
@@ -1,8 +1,9 @@
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/stats/StatsCounter.h"
 #include "StatTask.h"
+
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/stats/StatsCounter.h"
 
 class Tutorial;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp
index ceb113698..1565ad2f1 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp
@@ -1,9 +1,10 @@
+#include "TutorialTask.h"
+
 #include <compare>
 
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "TutorialTask.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 
 TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId,
                            bool enablePreCompletion,
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h
index d6aade628..faffe2b63 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h
@@ -1,19 +1,19 @@
 #pragma once
-#include "StatTask.h"
-#include "CraftTask.h"
-#include "PickupTask.h"
-#include "UseTileTask.h"
-#include "UseItemTask.h"
-#include "InfoTask.h"
-#include "ControllerTask.h"
-#include "ProcedureCompoundTask.h"
-#include "XuiCraftingTask.h"
-#include "StateChangeTask.h"
-#include "ChoiceTask.h"
-#include "HorseChoiceTask.h"
-#include "RideEntityTask.h"
-#include "FullTutorialActiveTask.h"
 #include "AreaTask.h"
-#include "ProgressFlagTask.h"
+#include "ChoiceTask.h"
 #include "CompleteUsingItemTask.h"
-#include "EffectChangedTask.h"
\ No newline at end of file
+#include "ControllerTask.h"
+#include "CraftTask.h"
+#include "EffectChangedTask.h"
+#include "FullTutorialActiveTask.h"
+#include "HorseChoiceTask.h"
+#include "InfoTask.h"
+#include "PickupTask.h"
+#include "ProcedureCompoundTask.h"
+#include "ProgressFlagTask.h"
+#include "RideEntityTask.h"
+#include "StatTask.h"
+#include "StateChangeTask.h"
+#include "UseItemTask.h"
+#include "UseTileTask.h"
+#include "XuiCraftingTask.h"
\ No newline at end of file
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
index 6f975e54e..0da47ee1d 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
@@ -1,8 +1,9 @@
+#include "UseItemTask.h"
+
 #include <memory>
 
-#include "minecraft/world/item/ItemInstance.h"
-#include "UseItemTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class Tutorial;
 class TutorialConstraint;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
index 49fbea800..49469a07e 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
@@ -1,8 +1,9 @@
+#include "UseTileTask.h"
+
 #include <memory>
 
-#include "minecraft/world/level/Level.h"
-#include "UseTileTask.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "minecraft/world/level/Level.h"
 
 class Tutorial;
 class TutorialConstraint;
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp
index 6d963d137..0654b8c27 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp
@@ -1,5 +1,6 @@
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "XuiCraftingTask.h"
+
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h"
 
 bool XuiCraftingTask::isCompleted() {
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
index f6b2c1a2b..6a741e1c9 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
@@ -1,27 +1,26 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "console_helpers/PlatformTime.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/server/level/SurvivalMode.h"
 #include "Tutorial.h"
-#include "TutorialMessage.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h"
-#include "console_helpers/StringHelpers.h"
 
 #include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "TutorialMessage.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/SurvivalMode.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 std::vector<int> Tutorial::s_completableTasks;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
index ed224af49..e23c530f4 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
@@ -1,14 +1,14 @@
 #pragma once
 // using namespace std;
-#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
-#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
-#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
-#include "TutorialMessage.h"
-#include "TutorialEnum.h"
-
 #include <cstdint>
 #include <unordered_map>
 
+#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
+#include "TutorialEnum.h"
+#include "TutorialMessage.h"
+
 // #define TUTORIAL_HINT_DELAY_TIME 14000 // How long we should wait from
 // displaying one hint to the next #define TUTORIAL_DISPLAY_MESSAGE_TIME 7000
 // #define TUTORIAL_MINIMUM_DISPLAY_MESSAGE_TIME 2000
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp
index 75876e1c2..e6287fcd1 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp
@@ -1,4 +1,5 @@
 #include "TutorialMessage.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 
 TutorialMessage::TutorialMessage(
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
index f34fafffd..557e39c6a 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
+++ b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
@@ -1,17 +1,18 @@
-#include "minecraft/stdafx.h"
-#include "console_helpers/PlatformTime.h"
+#include "TutorialMode.h"
+
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "TutorialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "console_helpers/PlatformTime.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class ClientConnection;
 
diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h
index 2fbddf974..a16c8b217 100644
--- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h
+++ b/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h
@@ -1,8 +1,8 @@
 #pragma once
 // using namespace std;
 
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Tutorial.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class ClientConnection;
 class Minecraft;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp
index 710b81d1d..5c6e6b536 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
@@ -1,13 +1,15 @@
+#include "ArchiveFile.h"
+
 #include <assert.h>
+
 #include <cstdlib>
 #include <utility>
 
-#include "console_helpers/PortableFileIO.h"
-#include "console_helpers/compression.h"
-#include "ArchiveFile.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/FileInputStream.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h
index f69d04058..ea51958b3 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h	
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
-#include <unordered_map>
 #include <format>
 #include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "java/File.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h
index cd6e237ec..0aefd404a 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h	
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "4J_Storage.h"
 #include "UIEnums.h"
 #include "UIStructs.h"
-#include "4J_Storage.h"
 #include "minecraft/sounds/SoundTypes.h"
 
 // 4J Stu - An interface class that defines all the public functions that we use
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
index 300c213cd..7e4880381 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp	
@@ -1,22 +1,20 @@
-#include <cmath>
-
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "IUIScene_AbstractContainerMenu.h"
 
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include <cmath>
+
+#include "4J.Common/4J_InputActions.h"
+#include "4J_Input.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-
-#include "4J_Input.h"
-#include "4J.Common/4J_InputActions.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/phys/Vec3.h"
 
 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() {
     m_menu = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp
index 66ea8e278..dcf019aef 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp	
@@ -1,12 +1,12 @@
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "IUIScene_AnvilMenu.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+
+#include "Minecraft.Client/include/stdafx.h"
 #include "java/InputOutputStream/InputOutputStream.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 
 IUIScene_AnvilMenu::IUIScene_AnvilMenu() {
     m_inventory = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp
index 82966fe1f..539636dc8 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp	
@@ -1,21 +1,23 @@
+#include "IUIScene_BeaconMenu.h"
+
 #include <assert.h>
+
 #include <string>
 #include <vector>
 
-#include "minecraft/network/packet/CustomPayloadPacket.h"
-#include "minecraft/util/HtmlString.h"
-#include "IUIScene_BeaconMenu.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/network/packet/CustomPayloadPacket.h"
+#include "minecraft/util/HtmlString.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/inventory/BeaconMenu.h"
 #include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
-#include "java/InputOutputStream/ByteArrayOutputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
 
 IUIScene_BeaconMenu::IUIScene_BeaconMenu() {
     m_beacon = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp
index 15f7dcdda..8303bd207 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_BrewingMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_BrewingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/BrewingStandMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp
index 904d1ff3a..0208753b6 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp	
@@ -1,13 +1,14 @@
+#include "IUIScene_CommandBlockMenu.h"
+
 #include <memory>
 
-#include "minecraft/network/packet/CustomPayloadPacket.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "IUIScene_CommandBlockMenu.h"
-#include "minecraft/world/level/tile/entity/CommandBlockEntity.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/network/packet/CustomPayloadPacket.h"
+#include "minecraft/world/level/tile/entity/CommandBlockEntity.h"
 
 void IUIScene_CommandBlockMenu::Initialise(CommandBlockEntity* commandBlock) {
     m_commandBlock = commandBlock;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp
index 3249f69f1..7f4727623 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_ContainerMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_ContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp
index aba1cf3be..abb7f01c6 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp	
@@ -1,13 +1,13 @@
-#include "Minecraft.Client/include/stdafx.h"
-#include "4J.Common/4J_InputActions.h"
+#include "IUIScene_CraftingMenu.h"
 
+#include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "IUIScene_CraftingMenu.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-#include "minecraft/client/Minecraft.h"
 
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA
     [IUIScene_CraftingMenu::m_iMaxGroup2x2] = {
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h
index 83fbdafd1..b9810692f 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h	
@@ -1,8 +1,8 @@
 #pragma once
-#include "minecraft/world/item/crafting/Recipy.h"
-#include "minecraft/world/item/Item.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/crafting/Recipy.h"
 
 class LocalPlayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp
index 4a2538fd6..feb144a8f 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp	
@@ -1,22 +1,21 @@
-#include <cmath>
-
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "IUIScene_CreativeMenu.h"
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
-#include "java/JavaMath.h"
+#include <cmath>
+
 #include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "java/JavaMath.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 // 4J JEV - Images for each tab.
 IUIScene_CreativeMenu::TabSpec** IUIScene_CreativeMenu::specs = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp
index 080952d79..ad8337c0e 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_DispenserMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp
index 9ba004cd0..78f3960d8 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp	
@@ -1,13 +1,15 @@
+#include "IUIScene_EnchantingMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "IUIScene_EnchantingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class Player;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp
index 7d96b0608..f42a769f6 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_FireworksMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_FireworksMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/FireworksMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp
index cf770afaf..eeb8a9845 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_FurnaceMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_FurnaceMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/FurnaceMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp
index c75af6e03..88ddc5b8f 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp	
@@ -1,15 +1,18 @@
+#include "IUIScene_HUD.h"
+
 #include <cmath>
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "IUIScene_HUD.h"
-#include "4J_Profile.h"
 #include "4J.Render/4J_Render.h"
+#include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "java/Class.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -19,8 +22,6 @@
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodData.h"
 #include "minecraft/world/level/material/Material.h"
-#include "java/Class.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 IUIScene_HUD::IUIScene_HUD() {
     m_lastActiveSlot = -1;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp
index a024700e9..077582066 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_HopperMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/HopperMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp
index c6d9c38e5..fc7b664a7 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_HorseInventoryMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h
index 40de92f80..04bcbcba1 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h	
@@ -4,8 +4,8 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/Container.h"
-#include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
+#include "minecraft/world/entity/player/Inventory.h"
 
 class Container;
 class EntityHorse;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp
index 4b90c3060..c8afa4a59 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp	
@@ -1,6 +1,7 @@
+#include "IUIScene_InventoryMenu.h"
+
 #include <assert.h>
 
-#include "IUIScene_InventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "minecraft/world/inventory/InventoryMenu.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp
index 84ad72317..8d89b4125 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp	
@@ -1,21 +1,22 @@
-#include <thread>
-#include <chrono>
-
 #include "IUIScene_PauseMenu.h"
+
+#include <chrono>
+#include <thread>
+
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "console_helpers/compression.h"
-#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 
 int IUIScene_PauseMenu::ExitGameDialogReturned(
     void* pParam, int iPad, C4JStorage::EMessageResult result) {
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h
index ad9bbd34b..e02e4343f 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h	
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "4J_Storage.h"
 #include "4J_Profile.h"
+#include "4J_Storage.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/include/stdafx.h"
 
 class IUIScene_PauseMenu {
 protected:
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp
index f6cb891d7..e5598db8e 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp	
@@ -1,17 +1,16 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
-#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
 #include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 
 IUIScene_TradingMenu::IUIScene_TradingMenu() {
     m_validOffersCount = 0;
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h
index ba0a72ce3..b35165931 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h	
@@ -1,8 +1,8 @@
 #pragma once
-#include "minecraft/world/inventory/MerchantMenu.h"
-#include "minecraft/util/HtmlString.h"
-#include "minecraft/world/item/Rarity.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "minecraft/util/HtmlString.h"
+#include "minecraft/world/inventory/MerchantMenu.h"
+#include "minecraft/world/item/Rarity.h"
 
 class MerchantRecipe;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h b/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h
index f43f49402..4497fd5c4 100644
--- a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h	
+++ b/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h	
@@ -5,10 +5,10 @@
 #include <cstdint>
 #include <cstring>
 
-#include "UIEnums.h"
-#include "Minecraft.Client/Common/App_Defines.h"
-#include "console_helpers/C4JThread.h"
 #include "4J.Storage/4J_Storage.h"
+#include "Minecraft.Client/Common/App_Defines.h"
+#include "UIEnums.h"
+#include "console_helpers/C4JThread.h"
 
 class Container;
 class Inventory;
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
index 2eb86f69f..b7973dc23 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp
@@ -1,13 +1,14 @@
+#include "UIComponent_Chat.h"
+
 #include <memory>
 
-#include "UIComponent_Chat.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Gui.h"
 
 UIComponent_Chat::UIComponent_Chat(int iPad, void* initData,
                                    UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h
index 760b58178..b210c92d3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h
@@ -2,11 +2,11 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp
index 2094ee573..955ad3e95 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp
@@ -1,4 +1,5 @@
 #include "UIComponent_DebugUIConsole.h"
+
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h
index 9456c066e..17913dcae 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h
@@ -3,9 +3,9 @@
 #include <deque>
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp
index 1fc0c84dc..2a7dcaee4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp
@@ -1,4 +1,5 @@
 #include "UIComponent_DebugUIMarketingGuide.h"
+
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h
index 524166141..bb33c97fb 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp
index d9088e6cf..38059de09 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp
@@ -1,6 +1,7 @@
 #include "UIComponent_Logo.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h"
+
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h
index 7c4760e34..457ad28d6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp
index 004f110af..d61f692d4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp
@@ -1,4 +1,5 @@
 #include "UIComponent_MenuBackground.h"
+
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h
index ad27eb500..d66795a10 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp
index 06a67d4df..a4553cb75 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp
@@ -1,13 +1,15 @@
+#include "UIComponent_Panorama.h"
+
 #include <stdint.h>
+
 #include <mutex>
 
-#include "UIComponent_Panorama.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/storage/LevelData.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h
index 9667a7835..010381785 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
index 3651e2133..74eee5452 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
@@ -1,7 +1,7 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIComponent_PressStartToPlay.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIComponent_PressStartToPlay.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "console_helpers/StringHelpers.h"
 
 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad,
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h
index 545f1548d..325d3d0e7 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIComponent_PressStartToPlay : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
index a12abbfc1..7fd029100 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
@@ -1,6 +1,7 @@
 #include "UIComponent_Tooltips.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h"
+
 #include "4J_Profile.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h"
 #include "Minecraft.Client/Common/src/UI/UILayer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h
index 35b4e7287..9e540c2e6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h
@@ -2,15 +2,15 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "4J.Common/4J_Compat.h"
+#include "4J.Common/4J_InputActions.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "4J.Common/4J_InputActions.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
index 6f7322791..bc0cdeca0 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
@@ -1,11 +1,11 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIComponent_TutorialPopup.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "console_helpers/StringHelpers.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h
index 0b153da57..328d3a47a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define TUTORIAL_POPUP_FADE_TIMER_ID 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
index 978427a0a..ea82df748 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
@@ -1,16 +1,17 @@
 
+#include "UIScene_HUD.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_HUD.h"
-#include "minecraft/client/renderer/BossMobGuiInfo.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Gui.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/client/renderer/BossMobGuiInfo.h"
 #include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/gui/Gui.h"
 
 UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer)
     : UIScene(iPad, parentLayer) {
diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h
index 4c5522ef7..05254b62e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h
+++ b/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define CHAT_LINES_COUNT 10
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp
index 6f1a12fd5..8489ca392 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp
@@ -1,7 +1,8 @@
 #include "UIControl.h"
-#include "java/JavaMath.h"
+
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/JavaMath.h"
 
 UIControl::UIControl() {
     m_parentScene = nullptr;
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h
index 90827f9f9..3f7763d99 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
+class UIScene;
+
 // This class for any name object in the flash scene
 class UIControl {
 public:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
index e4e2e6747..7951a8b7d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
@@ -1,13 +1,14 @@
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+
 #include <string>
 #include <vector>
 
-#include "UIControl.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "UIControl.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_Base::UIControl_Base() {
     m_bLabelChanged = false;
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h
index 05ab36271..6a6dc4ea3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h
@@ -2,10 +2,10 @@
 
 #include <string>
 
-#include "UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 // This class maps to the FJ_Base class in actionscript
 class UIControl_Base : public UIControl {
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp
index c95d20cf4..ad0c24648 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp
@@ -1,6 +1,7 @@
 #include "UIControl_BeaconEffectButton.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() {
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h
index 33b874b44..1beaa2646 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl.h"
 
 class UIControl_BeaconEffectButton : public UIControl {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
index 961ceccc4..567c139f5 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
@@ -1,6 +1,7 @@
 #include "UIControl_BitmapIcon.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h
index 6bbbcddc5..9c642ebe4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl.h"
 
 class UIControl_BitmapIcon : public UIControl {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
index 61a7d6a46..bfc7f969d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_Button.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h
index 3d563f6c8..6215ecf3a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_Button : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
index c6ac8eaed..0db0f20e6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_ButtonList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h
index 99cdac91c..f1d8baae2 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h
@@ -3,10 +3,11 @@
 #include <string>
 #include <vector>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_ButtonList : public UIControl_Base {
 protected:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
index 7e2f4132e..502d70c4c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_CheckBox.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h
index 1c2c054d3..4ce906153 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_CheckBox : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp
index 6ec4077b1..322b03437 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_Cursor.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
 
 UIControl_Cursor::UIControl_Cursor() {}
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h
index aae07e54d..4c7ca7e0b 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_Cursor : public UIControl_Base {
 public:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
index ed17095be..c79638d98 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_DLCList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h
index 9073d70f8..055990762 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_ButtonList.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_ButtonList.h"
 
 class UIControl_DLCList : public UIControl_ButtonList {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
index 1ca74bcb4..ab9ec8924 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_DynamicLabel.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h
index e6ef7826a..7c4f35395 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h
@@ -2,11 +2,12 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "UIControl_Base.h"
 
 class UIControl_DynamicLabel : public UIControl_Label {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp
index d60d0d388..6362cbdd5 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp
@@ -1,21 +1,23 @@
+#include "UIControl_EnchantmentBook.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 
-#include "UIControl_EnchantmentBook.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "minecraft/client/renderer/tileentity/EnchantTableRenderer.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/model/BookModel.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
+#include "java/Class.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/model/BookModel.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/tileentity/EnchantTableRenderer.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/Class.h"
-#include "minecraft/client/renderer/Textures.h"
 
 UIControl_EnchantmentBook::UIControl_EnchantmentBook() {
     UIControl::setControlType(UIControl::eEnchantmentBook);
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h
index 8631120d5..6873e48c8 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h
@@ -2,9 +2,10 @@
 
 #include <memory>
 
-#include "UIControl.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl.h"
 #include "java/Random.h"
 
 class UIScene_EnchantingMenu;
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
index d386771f2..a3d6e3db3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
@@ -1,24 +1,26 @@
-#include <GL/gl.h>
-#include <iterator>
-#include <sstream>
-#include <algorithm>
-#include <memory>
-
 #include "UIControl_EnchantmentButton.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
+
+#include <GL/gl.h>
+
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <sstream>
+
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "minecraft/client/gui/Font.h"
 
 UIControl_EnchantmentButton::UIControl_EnchantmentButton() {
     m_index = 0;
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h
index 8007cfc86..c05781592 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h
@@ -3,9 +3,10 @@
 #include <string>
 #include <vector>
 
-#include "UIControl_Button.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Button.h"
 #include "java/Random.h"
 
 class UIControl_EnchantmentButton : public UIControl_Button {
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp
index 139610b75..2d55d8a44 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_HTMLLabel.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 UIControl_HTMLLabel::UIControl_HTMLLabel() {}
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h
index 25d9b022a..4e22b6f70 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h
@@ -2,11 +2,12 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "UIControl_Base.h"
 
 class UIControl_HTMLLabel : public UIControl_Label {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
index ad3223b9c..85ef0ef8c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
@@ -1,9 +1,10 @@
 #include "UIControl_Label.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_Label::UIControl_Label() {}
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h
index 6f6268027..6fe9177ff 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Common/src/UI/UIString.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_Label : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
index a4f67cdcd..f645a6a8d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_LeaderboardList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h
index 55cc6ed9d..c1e282d82 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_LeaderboardList : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp
index bc7363c57..0a68229ba 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp
@@ -1,16 +1,18 @@
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/Options.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 // #include
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h
index 6659a1ad5..f500748f2 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl.h"
 
 class UIControl_MinecraftHorse : public UIControl {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp
index 07d7e8fdc..6ed407f52 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp
@@ -1,18 +1,20 @@
+#include "UIControl_MinecraftPlayer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "UIControl_MinecraftPlayer.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 
 UIControl_MinecraftPlayer::UIControl_MinecraftPlayer() {
     UIControl::setControlType(UIControl::eMinecraftPlayer);
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h
index f7e9dbc33..5bfb23ad4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl.h"
 
 class UIControl_MinecraftPlayer : public UIControl {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
index 7fa24b863..6eca367a9 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_PlayerList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h
index b74e79189..635cd9127 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_ButtonList.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_ButtonList.h"
 
 class UIControl_PlayerList : public UIControl_ButtonList {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp
index da8765f81..fdedfcb77 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp
@@ -1,25 +1,27 @@
+#include "UIControl_PlayerSkinPreview.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/client/Options.h"
-#include "UIControl_PlayerSkinPreview.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/entity/player/Player.h"
 #include "java/Class.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/world/entity/player/Player.h"
 
 // #define SKIN_PREVIEW_BOB_ANIM
 #define SKIN_PREVIEW_WALKING_ANIM
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h
index 69d6234aa..8f31b2648 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h
@@ -4,9 +4,10 @@
 #include <format>
 #include <string>
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "UIControl.h"
 #include "minecraft/client/renderer/Textures.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 
 class ModelPart;
 class EntityRenderer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
index d7df26b28..6e5bcdb71 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_Progress.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h
index 8e45221a3..4eebbabb4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_Progress : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
index bec4dd632..ce1316196 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_SaveList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h
index b3203e715..a19e5822f 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_ButtonList.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_ButtonList.h"
 
 class UIControl_SaveList : public UIControl_ButtonList {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
index a081d45ec..1336f601d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_Slider.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h
index f436d2195..510c0d9ce 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h
@@ -3,11 +3,12 @@
 #include <string>
 #include <vector>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_Slider : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp
index 32f4908bc..6025b136f 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_SlotList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; }
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h
index 2034c0edc..fce24ffca 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_SlotList : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
index 6b4ae90d2..329eb5ea3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_SpaceIndicatorBar.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "console_helpers/StringHelpers.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h
index d451f4b68..e33abea3a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h
@@ -1,15 +1,17 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <ranges>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_SpaceIndicatorBar : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
index 0244586a0..f26a3f00a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
@@ -1,9 +1,10 @@
 #include "UIControl_TextInput.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; }
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h
index 598941c74..13dc2c135 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Common/src/UI/UIString.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_TextInput : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
index a240482b6..09010f8e6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
@@ -1,7 +1,8 @@
 #include "UIControl_TexturePackList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
 #include "console_helpers/StringHelpers.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h
index 8e63acecf..2f0c50763 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h
@@ -2,10 +2,11 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIControl_Base.h"
 
 class UIControl_TexturePackList : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp
index 6bedb01f8..fdc754f2d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp
@@ -1,4 +1,5 @@
 #include "UIControl_Touch.h"
+
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h
index a449e5903..71f6ce95e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h
+++ b/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h
@@ -2,9 +2,10 @@
 
 #include <string>
 
-#include "UIControl_Base.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIControl_Base.h"
 
 class UIControl_Touch : public UIControl_Base {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
index b86897055..97c895a0a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
@@ -1,7 +1,8 @@
 
+#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h"
+
 #include <wchar.h>
 
-#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h"
 #include "4J_Input.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_enums.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h
index 3e99b9c7b..2dd95773a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h
@@ -2,13 +2,13 @@
 #ifdef _DEBUG_MENUS_ENABLED
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp
index 77dad9b8a..7bbdc794a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp
@@ -1,13 +1,13 @@
 #include "UIScene_DebugOptions.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h"
+
+#include "4J.Common/4J_InputActions.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
-#include "4J.Common/4J_InputActions.h"
-
 class UILayer;
 
 const wchar_t*
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h
index 4b564cb40..c8017ed61 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h
@@ -2,10 +2,10 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
index 4fab49ab5..b1a15f657 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
@@ -1,8 +1,10 @@
 
-#include <wchar.h>
-#include <memory>
-
 #include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h"
+
+#include <wchar.h>
+
+#include <memory>
+
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
@@ -24,13 +26,13 @@ class Player;
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugOverlay.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/server/MinecraftServer.h"
 
 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData,
                                            UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h
index 22f8747d0..3be35b7a6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h
@@ -5,11 +5,11 @@
 #include <utility>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "java/Class.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
index 21b57d641..429500f96 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
@@ -1,8 +1,10 @@
 
-#include <wchar.h>
-#include <memory>
-
 #include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h"
+
+#include <wchar.h>
+
+#include <memory>
+
 #include "4J_Input.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_enums.h"
@@ -14,9 +16,9 @@
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugSetCamera.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "console_helpers/StringHelpers.h"
 
 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
                                                UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h
index 1c875da21..1582caab2 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h
@@ -2,13 +2,13 @@
 #ifdef _DEBUG_MENUS_ENABLED
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp
index 135d0380d..8e1efdbc0 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp	
@@ -1,15 +1,17 @@
+#include "IUIScene_StartGame.h"
+
 #include <wchar.h>
+
 #include <cstdint>
 
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/Minecraft.h"
-#include "IUIScene_StartGame.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h
index 1c4219e64..08631bf0b 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h	
@@ -2,13 +2,13 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "4J_Storage.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp
index a744382ee..334fa6f19 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
@@ -1,21 +1,23 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include "minecraft/server/MinecraftServer.h"
+
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/world/level/LevelSettings.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/world/level/biome/BiomeSource.h"
-#include "minecraft/world/level/LevelType.h"
 #include "minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelType.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
 
 #if defined(_WINDOWS64)
 
 #include <windows.h>
+
 #include "../../../../../Windows64/Resource.h"
 #endif
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h
index c2f3e9592..ce8548a9e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h	
@@ -2,6 +2,12 @@
 
 #include "IUIScene_StartGame.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 
 class UIScene_CreateWorldMenu : public IUIScene_StartGame {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp
index 897c97e0a..a76bdd1a7 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_DLCMainMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_DLCMainMenu.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h
index cf2711430..22d5d6173 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_DLCMainMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp
index aa6ba85d7..c07f9fa06 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_DLCOffersMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_DLCOffersMenu.h"
 #include "console_helpers/StringHelpers.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h
index 40ccbb28c..5c206ccc1 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h	
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_DLCOffersMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp
index 1f1c96d24..3b9a1ab03 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_EULA.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_EULA.h"
 #include "console_helpers/StringHelpers.h"
 
 UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h
index 6fce36396..8493c67da 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h	
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_EULA : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp
index 3da63a4d5..2e7aeef25 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp	
@@ -1,6 +1,7 @@
 #include "UIScene_Intro.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h
index 0bc54e45b..bb0093a11 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h	
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp
index 1020d5c4a..1b688a8f8 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp	
@@ -1,9 +1,10 @@
 
+#include "UIScene_JoinMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_JoinMenu.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/client/Options.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/net.minecraft.world.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h
index 260014910..bce7a20f3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h	
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_JoinMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
index ddad8032e..d3464b763 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
@@ -1,9 +1,9 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "console_helpers/StringHelpers.h"
 #include "UIScene_LaunchMoreOptionsMenu.h"
+
 #include "4J_Input.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h
index a20b3c261..7a3974f7a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h	
@@ -1,5 +1,11 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_LaunchMoreOptionsMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp
index be5775687..ff100dc66 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp	
@@ -1,9 +1,10 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LeaderboardsMenu.h"
+
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h
index 331292181..81b5a0f1c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h	
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_LeaderboardsMenu : public UIScene,
                                  public LeaderboardReadListener {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
index 06e151a06..6aa1f3c7d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
@@ -1,14 +1,15 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LoadMenu.h"
+
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/client/Options.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/LevelSettings.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h
index 42479abc8..3cb1ff2f6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h	
@@ -4,6 +4,11 @@
 
 #include "IUIScene_StartGame.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 
 class UIScene_LoadMenu : public IUIScene_StartGame {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index 8df1252c8..3850e170f 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -1,22 +1,22 @@
-#include <thread>
-#include <chrono>
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LoadOrJoinMenu.h"
 
+#include <chrono>
+#include <thread>
+
+#include "Minecraft.Client/Common/src/Network/SessionInfo.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/PortableFileIO.h"
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
-#include "console_helpers/PortableFileIO.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "Minecraft.Client/Common/src/Network/SessionInfo.h"
 
 #if defined(SONY_REMOTE_STORAGE_DOWNLOAD)
 unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize = 0L;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h
index c8da7826f..9d8c75ee6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h	
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <vector>
 #include <string>
-
-#include "java/File.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
+#include <vector>
 
 #include "4J_Storage.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "java/File.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class LevelGenerationOptions;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
index 2fae140dc..3a73cdec1 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
@@ -1,14 +1,15 @@
 
-#include "minecraft/util/Mth.h"
+#include "UIScene_MainMenu.h"
+
+#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/User.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_MainMenu.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/util/Mth.h"
 
 Random* UIScene_MainMenu::random = new Random();
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h
index f3b63d3af..2aa843da6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h	
@@ -1,6 +1,11 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "java/Random.h"
 
 class UIScene_MainMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp
index 39df0296a..699011231 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_NewUpdateMessage.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_NewUpdateMessage.h"
 #include "console_helpers/StringHelpers.h"
 
 UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h
index 78e1c0e89..3c7e517b4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h	
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_NewUpdateMessage : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp
index 420169dd7..ac85a6aee 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_SaveMessage.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SaveMessage.h"
 
 #define PROFILE_LOADED_TIMER_ID 0
 #define PROFILE_LOADED_TIMER_TIME 50
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h
index a5c33bfaf..583b66893 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SaveMessage : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp
index 51e372873..ea05248e7 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_TrialExitUpsell.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_TrialExitUpsell.h"
 
 UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData,
                                                  UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp
index 1f548bc47..df64b38d9 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp	
@@ -1,11 +1,11 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_ControlsMenu.h"
+
+#include "4J_Input.h"
+#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
-#include "4J_Input.h"
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData,
                                            UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h
index c48366b99..d489dd271 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h	
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_ControlsMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp
index 7a6abad60..f1d8131f7 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp	
@@ -1,7 +1,8 @@
 
+#include "UIScene_Credits.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "console_helpers/StringHelpers.h"
-#include "UIScene_Credits.h"
 
 #define CREDIT_ICON -2
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp
index 83b5778fe..4c692db98 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_HelpAndOptionsMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_HelpAndOptionsMenu.h"
 #include "minecraft/client/Minecraft.h"
 
 UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h
index b54d90ff8..3ac367981 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define BUTTON_HAO_CHANGESKIN 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp
index abbad09cb..35135650e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_HowToPlay.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_HowToPlay.h"
 #include "console_helpers/StringHelpers.h"
 
 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] =
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h
index 1e1e4ed0f..5839dd031 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h	
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_HowToPlay : public UIScene {
 public:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp
index 42beb6354..4e16dc1c4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_HowToPlayMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_HowToPlayMenu.h"
 
 // strings for buttons in the list
 unsigned int UIScene_HowToPlayMenu::m_uiHTPButtonNameA[] = {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h
index 6ff45a2c2..153219b49 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_HowToPlayMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp
index 5134d50e9..3fdfa2bca 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp	
@@ -1,9 +1,10 @@
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LanguageSelector.h"
 
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+
 // strings for buttons in the list
 const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = {
     IDS_LANG_SYSTEM,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h
index 5bfbf6440..a9e1850b4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
@@ -1,10 +1,12 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/App_Defines.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 class UIScene_LanguageSelector : public UIScene {
 public:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp
index f6bbe6edb..dee5d6fa4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_ReinstallMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_ReinstallMenu.h"
 
 UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData,
                                              UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h
index 18d10ce9c..f35880802 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_ReinstallMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp
index d1e4b6e01..51e9b09b0 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_SettingsAudioMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsAudioMenu.h"
 
 UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData,
                                                      UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h
index 574dc9c56..3d491f8e8 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SettingsAudioMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp
index 44ff3466f..abf727879 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp	
@@ -1,7 +1,7 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIScene_SettingsControlMenu.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsControlMenu.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/client/Minecraft.h"
 
 UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h
index ef13d9c3d..501cf22d6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SettingsControlMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp
index 26b94f5c7..6aeb12655 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp	
@@ -1,7 +1,7 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIScene_SettingsGraphicsMenu.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsGraphicsMenu.h"
+#include "Minecraft.Client/include/stdafx.h"
 
 UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad,
                                                            void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h
index e7668b3c2..c62e26545 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SettingsGraphicsMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp
index 138a9e892..686c2726b 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_SettingsMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsMenu.h"
 #include "minecraft/client/Minecraft.h"
 
 UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h
index 2198933fd..677182e65 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h	
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define BUTTON_ALL_OPTIONS 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp
index 743b85c68..49802e6e4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_SettingsOptionsMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsOptionsMenu.h"
 
 int UIScene_SettingsOptionsMenu::m_iDifficultySettingA[4] = {
     IDS_DIFFICULTY_PEACEFUL, IDS_DIFFICULTY_EASY, IDS_DIFFICULTY_NORMAL,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h
index 8035c2159..a8ef6caba 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h	
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SettingsOptionsMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp
index c19edb7f5..6c43eb298 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_SettingsUIMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_SettingsUIMenu.h"
 
 UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData,
                                                UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h
index 2cdde0f1d..311288868 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_SettingsUIMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
index 106d3f8c4..db0ee9826 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
@@ -1,10 +1,11 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include "console_helpers/StringHelpers.h"
+
+#include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
-#include "Minecraft.Client/Common/Minecraft_Macros.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
 
 #define SKIN_SELECT_PACK_DEFAULT 0
 #define SKIN_SELECT_PACK_FAVORITES 1
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h
index f36c98b83..e33dd5d5a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
@@ -1,9 +1,12 @@
 #pragma once
 #include <cstdint>
 
-#include "console_helpers/Definitions.h"
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "console_helpers/Definitions.h"
 
 class UIScene_SkinSelectMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp
index 2514fed67..9a59c81ae 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp	
@@ -1,11 +1,11 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_AbstractContainerMenu.h"
 
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(
     int iPad, UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h
index 5cb6f7a79..9b4e58aba 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h	
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class AbstractContainerMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp
index 9e36980f3..0cf1d7121 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp	
@@ -1,11 +1,12 @@
 
+#include "UIScene_AnvilMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/Minecraft.h"
-#include "console_helpers/StringHelpers.h"
-#include "UIScene_AnvilMenu.h"
 
 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData,
                                      UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h
index b4ee0998e..9911d27e4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h	
@@ -1,10 +1,13 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h"
-#include "minecraft/world/inventory/MerchantMenu.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "4J_Input.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
+#include "UIScene_AbstractContainerMenu.h"
+#include "minecraft/world/inventory/MerchantMenu.h"
 
 class InventoryMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp
index 502d3ad90..efe302833 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp	
@@ -1,11 +1,11 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/client/Minecraft.h"
 #include "UIScene_BeaconMenu.h"
+
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 
 UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData,
                                        UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h
index bf13d7aee..4926b25ea 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h	
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu,
                            public IUIScene_BeaconMenu {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp
index b5ee49881..7c63ec550 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp	
@@ -1,15 +1,16 @@
+#include "UIScene_BrewingStandMenu.h"
+
 #include <assert.h>
 
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_BrewingStandMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/inventory/BrewingStandMenu.h"
 #include "minecraft/world/item/alchemy/PotionBrewing.h"
 #include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h
index 806e34d25..4ff3b123a 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h	
@@ -3,7 +3,6 @@
 #include <memory>
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -12,6 +11,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 class BrewingStandTileEntity;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp
index 2940437ef..a5af70480 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp	
@@ -1,14 +1,16 @@
+#include "UIScene_ContainerMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "UIScene_ContainerMenu.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/ContainerMenu.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h
index cb909fce8..dc1751548 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h	
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -10,6 +9,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp
index 125df4618..4740160eb 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
@@ -1,23 +1,25 @@
+#include "UIScene_CreativeMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "UIScene_CreativeMenu.h"
-#include "minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/SimpleContainer.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "minecraft/client/Minecraft.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h
index afa3b6796..d3441d7ff 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h	
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -11,6 +10,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp
index a318cc7a0..245482b46 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp	
@@ -1,14 +1,16 @@
+#include "UIScene_DispenserMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_DispenserMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/inventory/TrapMenu.h"
 #include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h
index 3e3721e6a..55afe18d8 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h	
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -10,6 +9,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp
index 16ba171ee..fff05fae7 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp	
@@ -1,9 +1,10 @@
 
+#include "UIScene_EnchantingMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/client/Minecraft.h"
-#include "UIScene_EnchantingMenu.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 
 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData,
                                                UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h
index 65f3290a7..02a40092d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h	
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp
index 6b8055267..d73f0dd10 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp	
@@ -1,11 +1,11 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIScene_FireworksMenu.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "UIScene_FireworksMenu.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 
 UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData,
                                              UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h
index 53d48c439..03e4a62e2 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h	
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp
index 753487516..b4a383ea8 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp	
@@ -1,11 +1,11 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/client/Minecraft.h"
 #include "UIScene_FurnaceMenu.h"
 
 #include "4J_Profile.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 
 UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData,
                                          UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h
index 625fb1c40..b1b9aa2fe 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h	
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp
index f7d243203..a317f55be 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp	
@@ -1,14 +1,16 @@
+#include "UIScene_HopperMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_HopperMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/HopperMenu.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h
index 3f708515a..d4fe7f131 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h	
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -10,6 +9,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp
index 2deebc0e6..8e30c34da 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp	
@@ -1,15 +1,17 @@
+#include "UIScene_HorseInventoryMenu.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_HorseInventoryMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 #include "minecraft/world/entity/player/Inventory.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h
index 5efe6e475..77cf5c144 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h	
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
@@ -12,6 +11,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "UIScene_AbstractContainerMenu.h"
 
 class InventoryMenu;
 class UILayer;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp
index 87a61e7f9..139eac4d6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
@@ -1,21 +1,20 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_InventoryMenu.h"
 
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/Lighting.h"
-#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
-
-#include "console_helpers/StringHelpers.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000)  // 1 second
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h
index ed491bd66..248dfd01c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h	
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
-
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "UIScene_AbstractContainerMenu.h"
 #include "minecraft/world/effect/MobEffect.h"
 
 class InventoryMenu;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp
index 0e74eb815..f0d00cd01 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp	
@@ -1,13 +1,14 @@
 
+#include "UIScene_TradingMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/util/HtmlString.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/Minecraft.h"
-#include "UIScene_TradingMenu.h"
 
 UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData,
                                          UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h
index 16fe78e7c..b4480ae5d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h	
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/UILayer.h"
-
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/src/UI/UILayer.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class InventoryMenu;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp
index 74f40dc36..ca11270be 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp	
@@ -1,9 +1,10 @@
 
+#include "UIScene_CraftingMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "UIScene_CraftingMenu.h"
 
 UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData,
                                            UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h
index b636b960a..cad0dc6d2 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h	
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define CRAFTING_INVENTORY_SLOT_START 0
 #define CRAFTING_INVENTORY_SLOT_END (CRAFTING_INVENTORY_SLOT_START + 27)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp
index ed6b1301c..9ed421a71 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp	
@@ -1,7 +1,8 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_DeathMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h
index c25d1b393..bd0206d71 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_DeathMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp
index 73ba75764..699dae55e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
@@ -1,11 +1,12 @@
 
+#include "UIScene_EndPoem.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_EndPoem.h"
 #include "Minecraft.Client/Common/src/UI/UIBitmapFont.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer)
     : UIScene(iPad, parentLayer) {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp
index 042494971..724b9d64c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp	
@@ -1,9 +1,10 @@
 
+#include "UIScene_InGameHostOptionsMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_InGameHostOptionsMenu.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/net.minecraft.network.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h
index 55804eb0e..0bd3eaae6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_InGameHostOptionsMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp
index 10e3f23fd..945f87c3e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp	
@@ -1,12 +1,11 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIScene_InGameInfoMenu.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_InGameInfoMenu.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/Minecraft.h"
 
 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData,
                                                UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h
index 0cbc979ea..a422f0a43 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h	
@@ -2,9 +2,11 @@
 
 #include <cstdint>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_InGameInfoMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp
index 0b13d706d..39b9a120c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp	
@@ -1,9 +1,10 @@
 
+#include "UIScene_InGamePlayerOptionsMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_InGamePlayerOptionsMenu.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
 
 #define CHECKBOXES_TIMER_ID 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h
index e163d5486..027efff64 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h	
@@ -2,8 +2,11 @@
 
 #include <cstdint>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_InGamePlayerOptionsMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp
index ca45f162f..2ac5cc368 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp	
@@ -1,6 +1,7 @@
 
+#include "UIScene_InGameSaveManagementMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_InGameSaveManagementMenu.h"
 
 namespace {
 int InGameSaveManagementThumbnailReturnedThunk(void* lpParam,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h
index a2fc70b75..022666257 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h	
@@ -2,6 +2,8 @@
 
 #include <cstdint>
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_InGameSaveManagementMenu : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp
index 2efd7df74..890e06e0d 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
@@ -1,14 +1,15 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_PauseMenu.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/MinecraftServer.h"
 
 UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData,
                                      UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h
index e17f3ee53..33547c380 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h	
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 #define BUTTON_PAUSE_RESUMEGAME 0
 #define BUTTON_PAUSE_HELPANDOPTIONS 1
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp
index ccb1a5f86..179c80fa6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
@@ -1,14 +1,15 @@
 
+#include "UIScene_SignEntryMenu.h"
+
+#include "4J_Input.h"
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "console_helpers/StringHelpers.h"
-#include "UIScene_SignEntryMenu.h"
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "4J_Input.h"
 
 UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData,
                                              UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h
index aedc71d05..ac17aa8a6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h	
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class SignTileEntity;
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp
index 532fc34f1..6f263aae4 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp	
@@ -1,10 +1,10 @@
 
+#include "UIScene_TeleportMenu.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_TeleportMenu.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/server/commands/TeleportCommand.h"
 
 UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h
index d84857319..9a73c518e 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
@@ -1,10 +1,12 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_TeleportMenu : public UIScene {
 private:
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
index e16e51840..729c524c9 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp
@@ -1,6 +1,7 @@
 
+#include "UIScene_ConnectingProgress.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_ConnectingProgress.h"
 #include "minecraft/client/Minecraft.h"
 
 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad,
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h
index 8fb437089..bd6a957a3 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_ConnectingProgress : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
index 808422693..3d32b85bc 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp
@@ -1,6 +1,7 @@
 
+#include "UIScene_FullscreenProgress.h"
+
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_FullscreenProgress.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/ProgressRenderer.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h
index de4c6cfb2..0570d7e09 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_FullscreenProgress : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
index 851871c3b..0e6ddee68 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
@@ -1,8 +1,7 @@
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_Keyboard.h"
 
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "console_helpers/StringHelpers.h"
 
 #define KEYBOARD_DONE_TIMER_ID 0
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h
index a7877f44b..67994afa6 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_Keyboard : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp
index 414b49964..c74afcf5c 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp
@@ -1,10 +1,9 @@
 
-#include "Minecraft.Client/include/stdafx.h"
+#include "UIScene_MessageBox.h"
 
 #include "4J_Profile.h"
-
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "UIScene_MessageBox.h"
+#include "Minecraft.Client/include/stdafx.h"
 
 UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData,
                                        UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h
index e3716cd45..60211106f 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_MessageBox : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
index 07c800fb2..7cf044cde 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp
@@ -1,8 +1,9 @@
 
-#include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_QuadrantSignin.h"
-#include "minecraft/client/Minecraft.h"
+
 #include "4J_Input.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "minecraft/client/Minecraft.h"
 
 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData,
                                                UILayer* parentLayer)
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h
index 4dca2733e..a72c8a242 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h
@@ -2,6 +2,8 @@
 
 #include <cstdint>
 
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UIScene_QuadrantSignin : public UIScene {
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp
index 00a03dda6..e3efb201f 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp
@@ -1,4 +1,5 @@
 #include "UIScene_Timer.h"
+
 #include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 
diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h
index 7bda82f45..d120649ab 100644
--- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h
+++ b/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/UIScene.h"
 
 class UILayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/UI.h b/targets/Minecraft.Client/Common/src/UI/UI.h
index d55bb5668..211c6893f 100644
--- a/targets/Minecraft.Client/Common/src/UI/UI.h
+++ b/targets/Minecraft.Client/Common/src/UI/UI.h
@@ -2,118 +2,106 @@
 
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-
-#include "UIBitmapFont.h"
-#include "UITTFFont.h"
-
-#include "UIScene.h"
-#include "UILayer.h"
-#include "UIGroup.h"
-#include "UIController.h"
-
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h"
-#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
-
-#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h"
-#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h"
-
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h"
-
-#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h"
+#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h"
-
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h"
-
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h"
-
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h"
-
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h"
-
-#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h"
 #include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h"
-#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h"
\ No newline at end of file
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h"
+#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h"
+#include "UIBitmapFont.h"
+#include "UIController.h"
+#include "UIGroup.h"
+#include "UILayer.h"
+#include "UIScene.h"
+#include "UITTFFont.h"
\ No newline at end of file
diff --git a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp b/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp
index 86986af3f..f5dab11dc 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp
@@ -1,6 +1,7 @@
+#include "UIBitmapFont.h"
+
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "UIFontData.h"
-#include "UIBitmapFont.h"
 
 /////////////////////////////
 // UI Abstract Bitmap Font //
diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.cpp b/targets/Minecraft.Client/Common/src/UI/UIController.cpp
index 957b356d1..9bacf5a9e 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIController.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIController.cpp
@@ -1,21 +1,22 @@
-#include "minecraft/stdafx.h"
-#include "console_helpers/PlatformTime.h"
 #include "UIController.h"
-#include "UI.h"
-#include "UIScene.h"
-#include "console_helpers/StringHelpers.h"
+
+#include "4J_Input.h"
 #include "Minecraft.Client/include/BufferedImage.h"
+#include "UI.h"
+#include "UIFontData.h"
+#include "UIScene.h"
+#include "console_helpers/PerformanceTimer.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
 #include "minecraft/client/skins/DLCTexturePack.h"
 #include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/title/TitleScreen.h"
-#include "console_helpers/PerformanceTimer.h"
-#include "UIFontData.h"
-#include "4J_Input.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
 
 // 4J Stu - Enable this to override the Iggy Allocator
 // #define ENABLE_IGGY_ALLOCATOR
diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.h b/targets/Minecraft.Client/Common/src/UI/UIController.h
index 54235d42f..8ccdeab1c 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIController.h
+++ b/targets/Minecraft.Client/Common/src/UI/UIController.h
@@ -10,12 +10,12 @@
 #include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
 #endif
 
-#include "4J_Storage.h"
 #include "4J.Common/4J_InputActions.h"
-
+#include "4J_Storage.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIController.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "UIGroup.h"
 
 class UIAbstractBitmapFont;
@@ -23,7 +23,6 @@ class UIBitmapFont;
 class UITTFFont;
 class UIComponent_DebugUIConsole;
 class UIComponent_DebugUIMarketingGuide;
-class UIControl;
 
 // Base class for all shared functions between UIControllers
 class UIController : public IUIController {
diff --git a/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp b/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp
index 2ce0799f7..6be8cab65 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp
@@ -1,7 +1,9 @@
-#include <assert.h>
+#include "UIFontData.h"
+
+#include <assert.h>
+
 #include <utility>
 
-#include "UIFontData.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
 /////////////////////////////////////////////////////
diff --git a/targets/Minecraft.Client/Common/src/UI/UIFontData.h b/targets/Minecraft.Client/Common/src/UI/UIFontData.h
index 1e9481a86..6ff436051 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIFontData.h
+++ b/targets/Minecraft.Client/Common/src/UI/UIFontData.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <unordered_map>
 #include <string>
+#include <unordered_map>
 
 // using namespace std;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp
index 022c16c35..39cf0ba65 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp
@@ -1,4 +1,5 @@
 #include "UIGroup.h"
+
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.h b/targets/Minecraft.Client/Common/src/UI/UIGroup.h
index 8307bec1c..5b84fbe42 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIGroup.h
+++ b/targets/Minecraft.Client/Common/src/UI/UIGroup.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <stdint.h>
 
-#include "UILayer.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "UILayer.h"
 
 class UIComponent_Tooltips;
 class UIComponent_TutorialPopup;
diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp
index 92f12068a..702c8ffe3 100644
--- a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UILayer.cpp
@@ -1,7 +1,7 @@
+#include "UILayer.h"
+
 #include <algorithm>
 
-#include "UILayer.h"
-#include "UIScene.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h"
 #include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h"
@@ -77,8 +77,9 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "UIScene.h"
 
 UILayer::UILayer(UIGroup* parent) {
     m_parentGroup = parent;
diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.h b/targets/Minecraft.Client/Common/src/UI/UILayer.h
index b84313bde..8a5a0bacb 100644
--- a/targets/Minecraft.Client/Common/src/UI/UILayer.h
+++ b/targets/Minecraft.Client/Common/src/UI/UILayer.h
@@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <ranges>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 // using namespace std;
diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp
index d3ed3ddd8..d4e63f848 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIScene.cpp
@@ -1,11 +1,11 @@
+#include "UIScene.h"
+
 #include <GL/gl.h>
-#include <mutex>
+
 #include <cstddef>
+#include <mutex>
 #include <utility>
 
-#include "UIScene.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
@@ -17,15 +17,17 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/System.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/System.h"
-#include "minecraft/client/Minecraft.h"
 
 class MultiplayerLocalPlayer;
 
diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.h b/targets/Minecraft.Client/Common/src/UI/UIScene.h
index 8afd15f41..9add45b86 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIScene.h
+++ b/targets/Minecraft.Client/Common/src/UI/UIScene.h
@@ -6,23 +6,25 @@
 //  different sized movies)
 
 #include <stddef.h>
+
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
 class ItemRenderer;
 class UILayer;
 class ItemInstance;
-class UIControl;
 class UIControl_Base;
+class UIControl;
 
 // 4J Stu - Setup some defines for quickly mapping elements in the scene
 
diff --git a/targets/Minecraft.Client/Common/src/UI/UIString.cpp b/targets/Minecraft.Client/Common/src/UI/UIString.cpp
index 0a260900f..d1ee7ea71 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIString.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UIString.cpp
@@ -1,9 +1,10 @@
-#include "console_helpers/StringHelpers.h"
 #include "UIString.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 
 bool UIString::setCurrentLanguage() {
     int nextLanguage, nextLocale;
diff --git a/targets/Minecraft.Client/Common/src/UI/UIString.h b/targets/Minecraft.Client/Common/src/UI/UIString.h
index 826780360..715b3e379 100644
--- a/targets/Minecraft.Client/Common/src/UI/UIString.h
+++ b/targets/Minecraft.Client/Common/src/UI/UIString.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <set>
 #include <functional>
 #include <memory>
+#include <set>
 #include <string>
 
 typedef std::function<std::wstring(void)> StringBuilder;
diff --git a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp b/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp
index e7b5bdcb5..4748fe202 100644
--- a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp
+++ b/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp
@@ -1,10 +1,12 @@
+#include "UITTFFont.h"
+
 #include <assert.h>
+
 #include <cstdio>
 
-#include "console_helpers/PortableFileIO.h"
-#include "UITTFFont.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/PortableFileIO.h"
 #include "console_helpers/StringHelpers.h"
 
 UITTFFont::UITTFFont(const std::string& name, const std::string& path,
diff --git a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
index a800e1c8d..2788af8f1 100644
--- a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
+++ b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
@@ -1,19 +1,18 @@
 #define GDRAW_ASSERTS
 
-#include <stdbool.h>
-
 #include "gdraw.h"
 
 #include <GL/gl.h>
-#include <string.h>
+#include <dlfcn.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <dlfcn.h>
-#include <stddef.h>
+#include <string.h>
 
-#include "SDL_video.h"
 #include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "SDL_video.h"
 
 #ifndef _ENABLEIGGY
 void* IggyGDrawMallocAnnotated(SINTa size, const char* file, int line) {
diff --git a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h
index 1dabc0dbe..0ffc9b09c 100644
--- a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h
+++ b/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h
@@ -1,10 +1,9 @@
 #ifndef __LINUX_IGGY_GDRAW_H__
 #define __LINUX_IGGY_GDRAW_H__
 
-#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
-
-#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
+#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
+#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp b/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp
index eb7a5fcdb..b85df2419 100644
--- a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp
+++ b/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp
@@ -1,4 +1,5 @@
 #include "LinuxLeaderboardManager.h"
+
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 
 LeaderboardManager* LeaderboardManager::m_instance =
diff --git a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h b/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h
index 17302286c..317b22586 100644
--- a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h
+++ b/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 #include "4J.Common/4J_Compat.h"
+#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 
 class LinuxLeaderboardManager : public LeaderboardManager {
 public:
diff --git a/targets/Minecraft.Client/Linux/LinuxGL.cpp b/targets/Minecraft.Client/Linux/LinuxGL.cpp
index b44b0e4ff..f6e7f18d7 100644
--- a/targets/Minecraft.Client/Linux/LinuxGL.cpp
+++ b/targets/Minecraft.Client/Linux/LinuxGL.cpp
@@ -3,10 +3,10 @@
 #include <cstring>
 
 #include "4J.Render/4J_Render.h"
-#include "java/IntBuffer.h"
-#include "java/FloatBuffer.h"
-#include "java/ByteBuffer.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "java/ByteBuffer.h"
+#include "java/FloatBuffer.h"
+#include "java/IntBuffer.h"
 
 extern C4JRender RenderManager;
 
@@ -108,9 +108,9 @@ void glEndList_4J(int) {}
 void glTexGen_4J(int, int, FloatBuffer*) {}
 
 // query objects
-#include <dlfcn.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
+#include <dlfcn.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/targets/Minecraft.Client/Linux/Linux_App.cpp b/targets/Minecraft.Client/Linux/Linux_App.cpp
index 619c6e7b3..9e637978f 100644
--- a/targets/Minecraft.Client/Linux/Linux_App.cpp
+++ b/targets/Minecraft.Client/Linux/Linux_App.cpp
@@ -1,19 +1,21 @@
+#include "Linux_App.h"
+
 #include <assert.h>
+
 #include <string>
 
-#include "Minecraft.Client/Common/Consoles_App.h"
-#include "minecraft/client/User.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/world/level/LevelSettings.h"
-#include "Linux_App.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "4J_Profile.h"
 #include "4J.Render/4J_Render.h"
+#include "4J_Profile.h"
 #include "4J_Storage.h"
+#include "Minecraft.Client/Common/Consoles_App.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/C4JThread.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/User.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/world/level/LevelSettings.h"
 
 CConsoleMinecraftApp app;
 
diff --git a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp
index db5b36fbe..e3fa9f013 100644
--- a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp
+++ b/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp
@@ -1,12 +1,14 @@
 // Minecraft.cpp : Defines the entry point for the application.
 //
-#include "Minecraft.Client/include/stdafx.h"
 #include <assert.h>
+
 #include <mutex>
+
+#include "Minecraft.Client/include/stdafx.h"
 // #include <system_service.h>
 #if defined(__linux__) && defined(__GLIBC__)
-#include <signal.h>
 #include <execinfo.h>
+#include <signal.h>
 #include <unistd.h>
 static void sigsegv_handler(int sig) {
     const char msg[] = "\n=== SIGNAL CAUGHT: ";
@@ -36,39 +38,37 @@ static void sigsegv_handler(int sig) {
     _exit(139);
 }
 #endif
-#include "minecraft/server/MinecraftServer.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/ThreadName.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/ConnectScreen.h"
 #include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/item/crafting/Recipes.h"
 #include "minecraft/world/item/crafting/Recipy.h"
-#include "minecraft/locale/Language.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/Vec3.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/User.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "console_helpers/ThreadName.h"
-#include "minecraft/stats/StatsCounter.h"
-#include "minecraft/client/multiplayer/ConnectScreen.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 // #include "../Common/XUI/XUI_Scene_Container.h"
 // #include "NetworkManager.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "console_helpers/compression.h"
-#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/App_Defines.h"
-
+#include "4J.Common/4J_InputActions.h"
 #include "4J_Input.h"
 #include "4J_Profile.h"
-#include "4J.Common/4J_InputActions.h"
+#include "Minecraft.Client/Common/App_Defines.h"
+#include "console_helpers/compression.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 
 // #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h"
 
diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.cpp b/targets/Minecraft.Client/Linux/Linux_UIController.cpp
index 66a76a8db..d3fec495d 100644
--- a/targets/Minecraft.Client/Linux/Linux_UIController.cpp
+++ b/targets/Minecraft.Client/Linux/Linux_UIController.cpp
@@ -1,12 +1,11 @@
 #include <GL/gl.h>
 
 // GDraw GL backend for Linux
-#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h"
-#include "Linux_UIController.h"
-#include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "4J.Render/4J_Render.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Linux_UIController.h"
 #include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Linux_UIController.h"
 
 ConsoleUIController ui;
 
diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.h b/targets/Minecraft.Client/Linux/Linux_UIController.h
index 7a80f5fbf..6d36efe1f 100644
--- a/targets/Minecraft.Client/Linux/Linux_UIController.h
+++ b/targets/Minecraft.Client/Linux/Linux_UIController.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Minecraft.Client/Common/src/UI/UIController.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "Minecraft.Client/Common/src/UI/UIController.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h b/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h
index 0d5ebecec..e3e629732 100644
--- a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h
+++ b/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h
@@ -121,8 +121,8 @@
 #pragma warning(disable : 4514 4820)
 // C4514/4820: Off by default noise
 #endif
-#include <math.h>
 #include <float.h>
+#include <math.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -147,8 +147,8 @@
 #endif
 
 #ifdef _XM_SSE_INTRINSICS_
-#include <xmmintrin.h>
 #include <emmintrin.h>
+#include <xmmintrin.h>
 
 #ifdef _XM_SSE3_INTRINSICS_
 #include <pmmintrin.h>
@@ -172,9 +172,10 @@
 #endif
 #endif  // !_XM_NO_INTRINSICS_
 
-#include "sal.h"
 #include <assert.h>
 
+#include "sal.h"
+
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4005 4668)
@@ -3074,9 +3075,9 @@ XMVectorSplatConstantInt(int32_t IntConstant) noexcept {
 }
 
 #include "DirectXMathConvert.inl"
-#include "DirectXMathVector.inl"
 #include "DirectXMathMatrix.inl"
 #include "DirectXMathMisc.inl"
+#include "DirectXMathVector.inl"
 
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h b/targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h
index 70bf93877..48a6a7c20 100644
--- a/targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h
+++ b/targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h
@@ -3,32 +3,33 @@
 
 #pragma once
 
-#include <cstdint>
-#include <cstring>
-#include <cstdlib>
-#include <string>
-#include <cerrno>
-#include <atomic>
-#include <climits>
-#include <cfloat>
-#include <cmath>
-#include <pthread.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <dirent.h>
+#include <fcntl.h>
 #include <fnmatch.h>
-#include <time.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <locale>
 #include <linux/mman.h>
+#include <pthread.h>
+#include <stdio.h>
 #include <sys/mman.h>
-#include <codecvt>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <atomic>
+#include <cerrno>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <codecvt>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <locale>
+#include <string>
 
-#include "winapi_stubs.h"
 #include "d3d11_stubs.h"
+#include "winapi_stubs.h"
 #include "xbox_stubs.h"
 
 #ifndef _ENABLEIGGY
diff --git a/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h b/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h
index eced81606..9496f7b9b 100644
--- a/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h
+++ b/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "winapi_stubs.h"
 #include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h"
+#include "winapi_stubs.h"
 
 using namespace DirectX;
 
diff --git a/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h
index 563aed229..7ed6b6980 100644
--- a/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h
+++ b/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h
@@ -3,16 +3,17 @@
 
 #pragma once
 
-#include <cassert>
-#include <cstdarg>
-#include <cerrno>
-#include <cstdio>
-#include <cwchar>
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <unistd.h>
+
+#include <cassert>
+#include <cerrno>
+#include <cstdarg>
+#include <cstdio>
+#include <cwchar>
 
 #define __cdecl
 #define _vsnprintf_s vsnprintf;
diff --git a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp b/targets/Minecraft.Client/Linux/linux_game_stubs.cpp
index 688e49176..f2b50084b 100644
--- a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp
+++ b/targets/Minecraft.Client/Linux/linux_game_stubs.cpp
@@ -8,7 +8,7 @@ void Display::update() {}
 int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; }
 
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 
 #endif
diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
index f1d152a23..eae540d50 100644
--- a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
+++ b/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
@@ -41,13 +41,13 @@
 #pragma warning(disable \
                 : 4201)  // nonstandard extension used : nameless struct/union
 
-#include <windows.h>
 #include <d3d11.h>
+#include <math.h>
+#include <string.h>
+#include <windows.h>
+
 #include "../include/gdraw.h"
 #include "../include/iggy.h"
-#include <string.h>
-#include <math.h>
-
 #include "gdraw_d3d11.h"
 
 #pragma warning(pop)
diff --git a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp
index 4b966d5db..96e6d3edd 100644
--- a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
+++ b/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
@@ -2,36 +2,37 @@
 //
 
 #include <assert.h>
+
 #include <mutex>
-#include "minecraft/server/MinecraftServer.h"
+
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/ThreadName.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/ConnectScreen.h"
 #include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/item/crafting/Recipes.h"
 #include "minecraft/world/item/crafting/Recipy.h"
-#include "minecraft/locale/Language.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/Vec3.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/User.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "console_helpers/ThreadName.h"
-#include "minecraft/stats/StatsCounter.h"
-#include "minecraft/client/multiplayer/ConnectScreen.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 // #include "Social/SocialManager.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 // #include "../Common/XUI/XUI_Scene_Container.h"
 // #include "NetworkManager.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/Options.h"
-#include "Sentient/SentientManager.h"
-#include "minecraft/client/renderer/Textures.h"
 #include "../Resource.h"
+#include "Sentient/SentientManager.h"
 #include "console_helpers/compression.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 
 HINSTANCE hMyInst;
diff --git a/targets/Minecraft.Client/Windows64/Windows64_App.cpp b/targets/Minecraft.Client/Windows64/Windows64_App.cpp
index d28e81453..73f7c3c37 100644
--- a/targets/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/targets/Minecraft.Client/Windows64/Windows64_App.cpp
@@ -1,15 +1,16 @@
 
+#include "Windows64_App.h"
+
 #include "Minecraft.Client/Common/Consoles_App.h"
-#include "minecraft/client/User.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/User.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/PlayerList.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSettings.h"
-#include "minecraft/world/level/biome/BiomeSource.h"
 #include "minecraft/world/level/LevelType.h"
-#include "Windows64_App.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
 
 CConsoleMinecraftApp app;
 
diff --git a/targets/Minecraft.Client/include/MemTexture.h b/targets/Minecraft.Client/include/MemTexture.h
index 0cbbce319..d0177229d 100644
--- a/targets/Minecraft.Client/include/MemTexture.h
+++ b/targets/Minecraft.Client/include/MemTexture.h
@@ -1,5 +1,8 @@
 #pragma once
+
 #include <cstdint>
+#include <string>
+
 class BufferedImage;
 class MemTextureProcessor;
 
diff --git a/targets/Minecraft.Client/include/stdafx.h b/targets/Minecraft.Client/include/stdafx.h
index 8343e6e21..b31881dc2 100644
--- a/targets/Minecraft.Client/include/stdafx.h
+++ b/targets/Minecraft.Client/include/stdafx.h
@@ -6,16 +6,16 @@
 #pragma once
 
 #ifdef _WINDOWS64
-#include "Minecraft.Client/Windows64/Windows64_App.h"
-#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
-#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
 #include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h"
+#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
+#include "Minecraft.Client/Windows64/Windows64_App.h"
 #include "Minecraft.Client/Windows64/Windows64_UIController.h"
+#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #else
-#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
+#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
 #endif
diff --git a/targets/Minecraft.Client/src/BufferedImage.cpp b/targets/Minecraft.Client/src/BufferedImage.cpp
index 9ccdbd618..33cce872f 100644
--- a/targets/Minecraft.Client/src/BufferedImage.cpp
+++ b/targets/Minecraft.Client/src/BufferedImage.cpp
@@ -1,18 +1,19 @@
-#include "console_helpers/StringHelpers.h"
-#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/include/BufferedImage.h"
+
+#include <cstdint>
+#include <filesystem>
+#include <format>
+#include <string>
+#include <vector>
+
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-
-#include <filesystem>
-#include <vector>
-#include <string>
-#include <cstdint>
-#include <format>
+#include "console_helpers/PathHelper.h"
+#include "console_helpers/StringHelpers.h"
 
 BufferedImage::BufferedImage(int width, int height, int type) {
     data[0] = new int[width * height];
diff --git a/targets/Minecraft.Client/src/Extrax64Stubs.cpp b/targets/Minecraft.Client/src/Extrax64Stubs.cpp
index a041df389..e8d85fd58 100644
--- a/targets/Minecraft.Client/src/Extrax64Stubs.cpp
+++ b/targets/Minecraft.Client/src/Extrax64Stubs.cpp
@@ -1,11 +1,10 @@
 
 
+#include <pthread.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <sys/time.h>
-#include <pthread.h>
 
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
diff --git a/targets/Minecraft.Client/src/stubs.cpp b/targets/Minecraft.Client/src/stubs.cpp
index 581649817..a3489744a 100644
--- a/targets/Minecraft.Client/src/stubs.cpp
+++ b/targets/Minecraft.Client/src/stubs.cpp
@@ -1,6 +1,7 @@
 
+#include "Minecraft.Client/include/stubs.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/include/stubs.h"
 #if defined(__linux__)
 
 void LinuxLogStubLightmapProbe() {
diff --git a/targets/console_helpers/include/console_helpers/PathHelper.h b/targets/console_helpers/include/console_helpers/PathHelper.h
index e02b755cd..f6933cb1f 100644
--- a/targets/console_helpers/include/console_helpers/PathHelper.h
+++ b/targets/console_helpers/include/console_helpers/PathHelper.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 #if defined(__linux__)
-#include <unistd.h>
 #include <limits.h>
+#include <unistd.h>
 #endif
 
 namespace PathHelper {
diff --git a/targets/console_helpers/include/console_helpers/compression.h b/targets/console_helpers/include/console_helpers/compression.h
index bb741d1bf..f5bb4b087 100644
--- a/targets/console_helpers/include/console_helpers/compression.h
+++ b/targets/console_helpers/include/console_helpers/compression.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <mutex>
+
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class Compression {
diff --git a/targets/console_helpers/src/C4JThread.cpp b/targets/console_helpers/src/C4JThread.cpp
index 4893d04c9..36150a756 100644
--- a/targets/console_helpers/src/C4JThread.cpp
+++ b/targets/console_helpers/src/C4JThread.cpp
@@ -1,20 +1,21 @@
 #include <sched.h>
+
+#include <algorithm>
+#include <atomic>
 #include <bit>
 #include <cassert>
 #include <cerrno>
 #include <chrono>
-#include <cstdio>
-#include <limits>
-#include <thread>
-#include <vector>
-#include <algorithm>
-#include <atomic>
 #include <condition_variable>
 #include <cstdint>
+#include <cstdio>
+#include <limits>
 #include <memory>
 #include <mutex>
 #include <queue>
 #include <string>
+#include <thread>
+#include <vector>
 
 #if defined(_WIN32)
 #include <Windows.h>
@@ -31,7 +32,6 @@
 
 #include "Minecraft.Client/Common/ShutdownManager.h"
 #include "console_helpers/C4JThread.h"
-#include "console_helpers/C4JThread.h"
 
 thread_local C4JThread* C4JThread::ms_currentThread = nullptr;
 
diff --git a/targets/console_helpers/src/PerformanceTimer.cpp b/targets/console_helpers/src/PerformanceTimer.cpp
index f15f20022..f1fe1c32a 100644
--- a/targets/console_helpers/src/PerformanceTimer.cpp
+++ b/targets/console_helpers/src/PerformanceTimer.cpp
@@ -1,9 +1,9 @@
 
+#include "console_helpers/PerformanceTimer.h"
+
 #include <chrono>
 #include <string>
 
-#include "console_helpers/PerformanceTimer.h"
-
 PerformanceTimer::PerformanceTimer() { Reset(); }
 
 void PerformanceTimer::Reset() {
diff --git a/targets/console_helpers/src/StringHelpers.cpp b/targets/console_helpers/src/StringHelpers.cpp
index b9c89c3a6..7ebfc1ac8 100644
--- a/targets/console_helpers/src/StringHelpers.cpp
+++ b/targets/console_helpers/src/StringHelpers.cpp
@@ -1,9 +1,9 @@
-#include "simdutf.h"
-
 #include <algorithm>
 #include <cassert>
-#include <vector>
 #include <sstream>
+#include <vector>
+
+#include "simdutf.h"
 
 std::wstring toLower(const std::wstring& a) {
     std::wstring out = std::wstring(a);
diff --git a/targets/console_helpers/src/compression.cpp b/targets/console_helpers/src/compression.cpp
index 6903c9eeb..0b7f7b2e8 100644
--- a/targets/console_helpers/src/compression.cpp
+++ b/targets/console_helpers/src/compression.cpp
@@ -1,15 +1,16 @@
 #include <assert.h>
 #include <string.h>
 #include <zconf.h>
+
 #include <cstdint>
 #include <mutex>
 
 // #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "console_helpers/compression.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/compression.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.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/targets/java/include/java/Arrays.h b/targets/java/include/java/Arrays.h
index 0ef1b14ef..38639cf01 100644
--- a/targets/java/include/java/Arrays.h
+++ b/targets/java/include/java/Arrays.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cassert>
 #include <cstdint>
+#include <vector>
 
 class Biome;
 
diff --git a/targets/java/include/java/Exceptions.h b/targets/java/include/java/Exceptions.h
index b21a13250..0f8ea8999 100644
--- a/targets/java/include/java/Exceptions.h
+++ b/targets/java/include/java/Exceptions.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <exception>
+#include <string>
 
 class EOFException : public std::exception {};
 
diff --git a/targets/java/include/java/File.h b/targets/java/include/java/File.h
index f7a4807e7..76fe374b7 100644
--- a/targets/java/include/java/File.h
+++ b/targets/java/include/java/File.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <cstdint>
+#include <string>
 #include <vector>
 
 // 4J Stu - Represents java standard library class
diff --git a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h
index 6f1f5d0c3..289b019b2 100644
--- a/targets/java/include/java/InputOutputStream/BufferedOutputStream.h
+++ b/targets/java/include/java/InputOutputStream/BufferedOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
+
 #include <cstdint>
 #include <vector>
 
diff --git a/targets/java/include/java/InputOutputStream/BufferedReader.h b/targets/java/include/java/InputOutputStream/BufferedReader.h
index 88e877806..b3a75af56 100644
--- a/targets/java/include/java/InputOutputStream/BufferedReader.h
+++ b/targets/java/include/java/InputOutputStream/BufferedReader.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Reader.h"
-
 #include <string>
 
+#include "Reader.h"
+
 class BufferedReader : public Reader {
 private:
     Reader* reader;
diff --git a/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h b/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h
index 65a6cc38f..c477a0ec0 100644
--- a/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h
+++ b/targets/java/include/java/InputOutputStream/ByteArrayInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 #include "InputStream.h"
 
diff --git a/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h b/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h
index 73c291e26..1a18a4564 100644
--- a/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h
+++ b/targets/java/include/java/InputOutputStream/ByteArrayOutputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "OutputStream.h"
-
-#include <vector>
 #include <cstdint>
+#include <vector>
+
+#include "OutputStream.h"
 
 class ByteArrayOutputStream : public OutputStream {
     // Note - when actually implementing, std::vector<uint8_t> will need to grow
diff --git a/targets/java/include/java/InputOutputStream/DataInput.h b/targets/java/include/java/InputOutputStream/DataInput.h
index 367da6cbe..b3bcf9073 100644
--- a/targets/java/include/java/InputOutputStream/DataInput.h
+++ b/targets/java/include/java/InputOutputStream/DataInput.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataInput {
 public:
diff --git a/targets/java/include/java/InputOutputStream/DataInputStream.h b/targets/java/include/java/InputOutputStream/DataInputStream.h
index a0b01d6fa..3bc5f12b0 100644
--- a/targets/java/include/java/InputOutputStream/DataInputStream.h
+++ b/targets/java/include/java/InputOutputStream/DataInputStream.h
@@ -2,11 +2,11 @@
 // 4J Stu - Represents Java standard library class (although we miss out an
 // intermediate inheritance class that we don't care about)
 
-#include <string>
 #include <cstdint>
+#include <string>
 
-#include "InputStream.h"
 #include "DataInput.h"
+#include "InputStream.h"
 
 class DataInputStream : public InputStream, public DataInput {
 private:
diff --git a/targets/java/include/java/InputOutputStream/DataOutput.h b/targets/java/include/java/InputOutputStream/DataOutput.h
index b0d61072d..dc83c7d93 100644
--- a/targets/java/include/java/InputOutputStream/DataOutput.h
+++ b/targets/java/include/java/InputOutputStream/DataOutput.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <string>
+#include <vector>
 
 class DataOutput {
 public:
diff --git a/targets/java/include/java/InputOutputStream/DataOutputStream.h b/targets/java/include/java/InputOutputStream/DataOutputStream.h
index 1821ad734..730ea6005 100644
--- a/targets/java/include/java/InputOutputStream/DataOutputStream.h
+++ b/targets/java/include/java/InputOutputStream/DataOutputStream.h
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "OutputStream.h"
 #include "DataOutput.h"
+#include "OutputStream.h"
 
 class DataOutputStream : public OutputStream, public DataOutput {
 private:
diff --git a/targets/java/include/java/InputOutputStream/FileInputStream.h b/targets/java/include/java/InputOutputStream/FileInputStream.h
index 2c084cf0d..ae27e21aa 100644
--- a/targets/java/include/java/InputOutputStream/FileInputStream.h
+++ b/targets/java/include/java/InputOutputStream/FileInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 // 4J Stu - Represents Java standard library class
 
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
 
 #include "InputStream.h"
 
diff --git a/targets/java/include/java/InputOutputStream/InputOutputStream.h b/targets/java/include/java/InputOutputStream/InputOutputStream.h
index 1708c213a..b866ad253 100644
--- a/targets/java/include/java/InputOutputStream/InputOutputStream.h
+++ b/targets/java/include/java/InputOutputStream/InputOutputStream.h
@@ -1,20 +1,18 @@
 #pragma once
 
-#include "InputStream.h"
+#include "BufferedOutputStream.h"
+#include "BufferedReader.h"
 #include "ByteArrayInputStream.h"
+#include "ByteArrayOutputStream.h"
 #include "DataInput.h"
 #include "DataInputStream.h"
-#include "FileInputStream.h"
-#include "GZIPInputStream.h"
-
-#include "OutputStream.h"
-#include "ByteArrayOutputStream.h"
 #include "DataOutput.h"
-#include "BufferedOutputStream.h"
 #include "DataOutputStream.h"
+#include "FileInputStream.h"
 #include "FileOutputStream.h"
+#include "GZIPInputStream.h"
 #include "GZIPOutputStream.h"
-
-#include "Reader.h"
-#include "BufferedReader.h"
-#include "InputStreamReader.h"
\ No newline at end of file
+#include "InputStream.h"
+#include "InputStreamReader.h"
+#include "OutputStream.h"
+#include "Reader.h"
\ No newline at end of file
diff --git a/targets/java/include/java/InputOutputStream/InputStream.h b/targets/java/include/java/InputOutputStream/InputStream.h
index 5d67c9854..11093bb53 100644
--- a/targets/java/include/java/InputOutputStream/InputStream.h
+++ b/targets/java/include/java/InputOutputStream/InputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
 #include <string>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 
diff --git a/targets/java/include/java/InputOutputStream/InputStreamReader.h b/targets/java/include/java/InputOutputStream/InputStreamReader.h
index 15e2a388c..883bf68f9 100644
--- a/targets/java/include/java/InputOutputStream/InputStreamReader.h
+++ b/targets/java/include/java/InputOutputStream/InputStreamReader.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Reader.h"
 #include "DataInputStream.h"
+#include "Reader.h"
 
 class InputStream;
 
diff --git a/targets/java/include/java/InputOutputStream/OutputStream.h b/targets/java/include/java/InputOutputStream/OutputStream.h
index 5ba23fb0a..6f932745a 100644
--- a/targets/java/include/java/InputOutputStream/OutputStream.h
+++ b/targets/java/include/java/InputOutputStream/OutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 // 4J Stu - Represents Java standard lib abstract
 
diff --git a/targets/java/include/java/JavaIntHash.h b/targets/java/include/java/JavaIntHash.h
index bc4fa0e33..0296ab849 100644
--- a/targets/java/include/java/JavaIntHash.h
+++ b/targets/java/include/java/JavaIntHash.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "java/Class.h"
-
 #include <cstdint>
 
+#include "java/Class.h"
+
 // Java doesn't have a default hash value for ints, however, the hashmap itself
 // does some "supplemental" hashing, so our ints actually get hashed by code as
 // implemented below. std templates *do* have a standard hash for ints, but it
diff --git a/targets/java/include/java/System.h b/targets/java/include/java/System.h
index 8af0e13e2..c9bb3f95a 100644
--- a/targets/java/include/java/System.h
+++ b/targets/java/include/java/System.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <cstdint>
-#include <vector>
 #include <algorithm>
-#include <cstring>
 #include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <vector>
 
 class Biome;
 class Node;
diff --git a/targets/java/src/Buffer.cpp b/targets/java/src/Buffer.cpp
index 97113de22..dc24791fa 100644
--- a/targets/java/src/Buffer.cpp
+++ b/targets/java/src/Buffer.cpp
@@ -1,4 +1,5 @@
 #include "java/Buffer.h"
+
 #include <cassert>
 
 Buffer::Buffer(unsigned int capacity)
diff --git a/targets/java/src/ByteBuffer.cpp b/targets/java/src/ByteBuffer.cpp
index 0e5ce29af..c269c35e0 100644
--- a/targets/java/src/ByteBuffer.cpp
+++ b/targets/java/src/ByteBuffer.cpp
@@ -1,14 +1,16 @@
 
+#include "java/ByteBuffer.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 #include <vector>
 
-#include "java/IntBuffer.h"
-#include "java/FloatBuffer.h"
-#include "java/ByteBuffer.h"
 #include "java/Buffer.h"
+#include "java/FloatBuffer.h"
+#include "java/IntBuffer.h"
 
 ByteBuffer::ByteBuffer(unsigned int capacity) : Buffer(capacity) {
     hasBackingArray = false;
diff --git a/targets/java/src/Color.cpp b/targets/java/src/Color.cpp
index 2d454de2a..7dff286c4 100644
--- a/targets/java/src/Color.cpp
+++ b/targets/java/src/Color.cpp
@@ -1,8 +1,8 @@
+#include "java/Color.h"
+
 #include <cassert>
 #include <cmath>
 
-#include "java/Color.h"
-
 // Creates an opaque sRGB color with the specified red, green, and blue values
 // in the range (0.0 - 1.0). Alpha is defaulted to 1.0. The actual color used in
 // rendering depends on finding the best match given the color space available
diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp
index fea598ad8..85d77f291 100644
--- a/targets/java/src/File.cpp
+++ b/targets/java/src/File.cpp
@@ -1,16 +1,18 @@
+#include "java/File.h"
+
 #include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
+
 #include <chrono>
 #include <filesystem>
 #include <string>
 #include <system_error>
 #include <vector>
 
-#include "java/FileFilter.h"
-#include "java/File.h"
 #include "console_helpers/PathHelper.h"     // 4jcraft TODO
 #include "console_helpers/StringHelpers.h"  // 4jcraft TODO
+#include "java/FileFilter.h"
 
 const wchar_t File::pathSeparator = L'/';
 
diff --git a/targets/java/src/InputOutputStream/BufferedReader.cpp b/targets/java/src/InputOutputStream/BufferedReader.cpp
index 986dbe466..7e1b61dd1 100644
--- a/targets/java/src/InputOutputStream/BufferedReader.cpp
+++ b/targets/java/src/InputOutputStream/BufferedReader.cpp
@@ -1,7 +1,7 @@
 #include "java/InputOutputStream/BufferedReader.h"
 
-#include <cstring>
 #include <cassert>
+#include <cstring>
 
 // Creates a buffering character-input stream that uses a default-sized input
 // buffer. Parameters: in - A Reader
diff --git a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp
index 0e7a82056..e48294500 100644
--- a/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp
+++ b/targets/java/src/InputOutputStream/ByteArrayInputStream.cpp
@@ -5,13 +5,14 @@
 // mark is set to the specified offset. Parameters: buf - the input buffer.
 // offset - the offset in the buffer of the first byte to read.
 // length - the maximum number of bytes to read from the buffer.
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <cstring>
 #include <vector>
 
-#include "java/InputOutputStream/ByteArrayInputStream.h"
-
 ByteArrayInputStream::ByteArrayInputStream(std::vector<uint8_t>& buf,
                                            unsigned int offset,
                                            unsigned int length)
diff --git a/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp b/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp
index b32d280bf..46ddd3671 100644
--- a/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp
+++ b/targets/java/src/InputOutputStream/ByteArrayOutputStream.cpp
@@ -1,6 +1,7 @@
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 
 #include <assert.h>
+
 #include <algorithm>
 #include <cstring>
 
diff --git a/targets/java/src/InputOutputStream/DataInputStream.cpp b/targets/java/src/InputOutputStream/DataInputStream.cpp
index af8756f07..b33dc8d6b 100644
--- a/targets/java/src/InputOutputStream/DataInputStream.cpp
+++ b/targets/java/src/InputOutputStream/DataInputStream.cpp
@@ -1,10 +1,12 @@
+#include "java/InputOutputStream/DataInputStream.h"
+
 #include <stdio.h>
+
 #include <bit>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/InputStream.h"
 
 // Creates a DataInputStream that uses the specified underlying InputStream.
diff --git a/targets/java/src/InputOutputStream/DataOutputStream.cpp b/targets/java/src/InputOutputStream/DataOutputStream.cpp
index 2960f2e26..660904258 100644
--- a/targets/java/src/InputOutputStream/DataOutputStream.cpp
+++ b/targets/java/src/InputOutputStream/DataOutputStream.cpp
@@ -1,10 +1,12 @@
+#include "java/InputOutputStream/DataOutputStream.h"
+
 #include <stdio.h>
+
 #include <bit>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "java/InputOutputStream/DataOutputStream.h"
 #include "java/InputOutputStream/OutputStream.h"
 
 // Creates a new data output stream to write data to the specified underlying
diff --git a/targets/java/src/InputOutputStream/FileInputStream.cpp b/targets/java/src/InputOutputStream/FileInputStream.cpp
index 33e2669e1..141958d8e 100644
--- a/targets/java/src/InputOutputStream/FileInputStream.cpp
+++ b/targets/java/src/InputOutputStream/FileInputStream.cpp
@@ -1,15 +1,17 @@
 
+#include "java/InputOutputStream/FileInputStream.h"
+
 #include <assert.h>
 #include <sys/types.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <string>
 #include <vector>
 
-#include "java/File.h"
-#include "java/InputOutputStream/FileInputStream.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/File.h"
 
 namespace {
 int64_t FileTell(std::FILE* file) {
diff --git a/targets/java/src/InputOutputStream/FileOutputStream.cpp b/targets/java/src/InputOutputStream/FileOutputStream.cpp
index 3d23b5dc0..99c3838f1 100644
--- a/targets/java/src/InputOutputStream/FileOutputStream.cpp
+++ b/targets/java/src/InputOutputStream/FileOutputStream.cpp
@@ -1,11 +1,11 @@
+#include "java/InputOutputStream/FileOutputStream.h"
+
 #include <cassert>
 #include <cstdint>
 #include <vector>
 
-#include "java/File.h"
-#include "java/InputOutputStream/FileOutputStream.h"
-
 #include "console_helpers/StringHelpers.h"  // 4jcraft TODO
+#include "java/File.h"
 
 // Creates a file output stream to write to the file represented by the
 // specified File object. A new FileDescriptor object is created to represent
diff --git a/targets/java/src/InputOutputStream/InputStream.cpp b/targets/java/src/InputOutputStream/InputStream.cpp
index a6ef244ca..9550c46b6 100644
--- a/targets/java/src/InputOutputStream/InputStream.cpp
+++ b/targets/java/src/InputOutputStream/InputStream.cpp
@@ -1,7 +1,8 @@
+#include "java/InputOutputStream/InputStream.h"
+
 #include <string>
 
 #include "java/File.h"
-#include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/FileInputStream.h"
 
 InputStream* InputStream::getResourceAsStream(const std::wstring& fileName) {
diff --git a/targets/java/src/InputOutputStream/InputStreamReader.cpp b/targets/java/src/InputOutputStream/InputStreamReader.cpp
index 74bba0c12..976ad145f 100644
--- a/targets/java/src/InputOutputStream/InputStreamReader.cpp
+++ b/targets/java/src/InputOutputStream/InputStreamReader.cpp
@@ -1,6 +1,7 @@
-#include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/InputStreamReader.h"
 
+#include "java/InputOutputStream/DataInputStream.h"
+
 class InputStream;
 
 // Creates an InputStreamReader that uses the default charset.
diff --git a/targets/java/src/IntBuffer.cpp b/targets/java/src/IntBuffer.cpp
index 88007731d..bd917723b 100644
--- a/targets/java/src/IntBuffer.cpp
+++ b/targets/java/src/IntBuffer.cpp
@@ -2,6 +2,7 @@
 
 #include <assert.h>
 #include <string.h>
+
 #include <algorithm>
 
 #include "java/Buffer.h"
diff --git a/targets/java/src/Random.cpp b/targets/java/src/Random.cpp
index 69309cec0..d64759a09 100644
--- a/targets/java/src/Random.cpp
+++ b/targets/java/src/Random.cpp
@@ -1,10 +1,10 @@
-#include <cassert>
-#include <cmath>
-#include <chrono>
-#include <cstdint>  // for int64_t
-
 #include "java/Random.h"
 
+#include <cassert>
+#include <chrono>
+#include <cmath>
+#include <cstdint>  // for int64_t
+
 Random::Random() {
     // 4J - jave now uses the system nanosecond counter added to a
     // "seedUniquifier" to get an initial seed. Our nanosecond timer is actually
diff --git a/targets/java/src/system.cpp b/targets/java/src/system.cpp
index 19315f327..f71bb6433 100644
--- a/targets/java/src/system.cpp
+++ b/targets/java/src/system.cpp
@@ -1,12 +1,12 @@
-#include <chrono>
+#include "java/System.h"
 
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
-#include <algorithm>
-#include <vector>
 
-#include "java/System.h"
+#include <algorithm>
+#include <chrono>
+#include <vector>
 
 class Biome;
 class Node;
diff --git a/targets/minecraft/Direction.cpp b/targets/minecraft/Direction.cpp
index b771e4aa5..8915d269b 100644
--- a/targets/minecraft/Direction.cpp
+++ b/targets/minecraft/Direction.cpp
@@ -1,4 +1,5 @@
 #include "Direction.h"
+
 #include "Facing.h"
 #include "minecraft/util/Mth.h"
 
diff --git a/targets/minecraft/Pos.cpp b/targets/minecraft/Pos.cpp
index 62287bc35..ab4c224c8 100644
--- a/targets/minecraft/Pos.cpp
+++ b/targets/minecraft/Pos.cpp
@@ -1,8 +1,9 @@
 
 
+#include "minecraft/Pos.h"
+
 #include <math.h>
 
-#include "minecraft/Pos.h"
 #include "minecraft/Pos.h"
 
 Pos::Pos() { x = y = z = 0; }
diff --git a/targets/minecraft/SharedConstants.cpp b/targets/minecraft/SharedConstants.cpp
index 31cdca7c6..54d8f8315 100644
--- a/targets/minecraft/SharedConstants.cpp
+++ b/targets/minecraft/SharedConstants.cpp
@@ -1,7 +1,8 @@
 
+#include "minecraft/SharedConstants.h"
+
 #include <string>
 
-#include "minecraft/SharedConstants.h"
 #include "minecraft/SharedConstants.h"
 
 const std::wstring SharedConstants::VERSION_STRING = L"1.6.4";
diff --git a/targets/minecraft/StaticConstructors.cpp b/targets/minecraft/StaticConstructors.cpp
index e55717e95..654e17ec3 100644
--- a/targets/minecraft/StaticConstructors.cpp
+++ b/targets/minecraft/StaticConstructors.cpp
@@ -1,8 +1,9 @@
 #include "minecraft/StaticConstructors.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/stats/CommonStats.h"
+
 #include "minecraft/SharedConstants.h"
 #include "minecraft/network/packet/Packet.h"
+#include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/stats/CommonStats.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/stats/Stats.h"
 #include "minecraft/world/effect/MobEffect.h"
diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp
index fca7b13d7..8c140f387 100644
--- a/targets/minecraft/client/Camera.cpp
+++ b/targets/minecraft/client/Camera.cpp
@@ -1,21 +1,23 @@
+#include "Camera.h"
+
 #include <GL/gl.h>
 #include <math.h>
 #include <string.h>
+
 #include <numbers>
 
-#include "Camera.h"
 #include "MemoryTracker.h"
-#include "minecraft/world/level/TilePos.h"
 #include "Minecraft.Client/Linux/Stubs/d3d11_stubs.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "java/FloatBuffer.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/TilePos.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/LiquidTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "java/FloatBuffer.h"
-#include "Minecraft.Client/include/stubs.h"
 
 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;
diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp
index 71147e024..0b8f4cfe4 100644
--- a/targets/minecraft/client/ClientConstants.cpp
+++ b/targets/minecraft/client/ClientConstants.cpp
@@ -1,6 +1,7 @@
 #include "ClientConstants.h"
-#include "minecraft/client/ClientConstants.h"
+
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
+#include "minecraft/client/ClientConstants.h"
 
 const std::wstring ClientConstants::VERSION_STRING =
     std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W +
diff --git a/targets/minecraft/client/DemoUser.cpp b/targets/minecraft/client/DemoUser.cpp
index 17811194d..ded80f007 100644
--- a/targets/minecraft/client/DemoUser.cpp
+++ b/targets/minecraft/client/DemoUser.cpp
@@ -1,6 +1,7 @@
+#include "DemoUser.h"
+
 #include <string>
 
-#include "DemoUser.h"
 #include "minecraft/client/User.h"
 
 DemoUser::DemoUser() : User(L"DemoUser", L"n/a") {}
\ No newline at end of file
diff --git a/targets/minecraft/client/GuiMessage.cpp b/targets/minecraft/client/GuiMessage.cpp
index cd15c705c..802dd7b4d 100644
--- a/targets/minecraft/client/GuiMessage.cpp
+++ b/targets/minecraft/client/GuiMessage.cpp
@@ -1,4 +1,5 @@
 #include "GuiMessage.h"
+
 #include "minecraft/client/GuiMessage.h"
 
 GuiMessage::GuiMessage(const std::wstring& string) {
diff --git a/targets/minecraft/client/Lighting.cpp b/targets/minecraft/client/Lighting.cpp
index 11f69a866..38a0fb477 100644
--- a/targets/minecraft/client/Lighting.cpp
+++ b/targets/minecraft/client/Lighting.cpp
@@ -1,10 +1,11 @@
+#include "Lighting.h"
+
 #include <GL/gl.h>
 
-#include "Lighting.h"
-#include "java/FloatBuffer.h"
-#include "minecraft/world/phys/Vec3.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "java/FloatBuffer.h"
+#include "minecraft/world/phys/Vec3.h"
 
 FloatBuffer* Lighting::lb = new FloatBuffer(16);
 
diff --git a/targets/minecraft/client/MemoryTracker.cpp b/targets/minecraft/client/MemoryTracker.cpp
index baa874fba..e5592886f 100644
--- a/targets/minecraft/client/MemoryTracker.cpp
+++ b/targets/minecraft/client/MemoryTracker.cpp
@@ -1,10 +1,11 @@
+#include "MemoryTracker.h"
+
 #include <utility>
 #include <vector>
 
-#include "MemoryTracker.h"
+#include "4J.Render/4J_Render.h"
 #include "java/ByteBuffer.h"
 #include "minecraft/client/MemoryTracker.h"
-#include "4J.Render/4J_Render.h"
 
 std::unordered_map<int, int> MemoryTracker::GL_LIST_IDS;
 std::vector<int> MemoryTracker::TEXTURE_IDS;
diff --git a/targets/minecraft/client/MemoryTracker.h b/targets/minecraft/client/MemoryTracker.h
index 9726cbd23..60d67d75e 100644
--- a/targets/minecraft/client/MemoryTracker.h
+++ b/targets/minecraft/client/MemoryTracker.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <format>
 #include <unordered_map>
+#include <vector>
 
 class ByteBuffer;
 class IntBuffer;
diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp
index 471eace5c..d807d5a6e 100644
--- a/targets/minecraft/client/Minecraft.cpp
+++ b/targets/minecraft/client/Minecraft.cpp
@@ -1,94 +1,92 @@
-#include <thread>
+#include "Minecraft.h"
+
 #include <chrono>
 #include <ctime>
+#include <thread>
 
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "Minecraft.h"
-#include "minecraft/server/level/GameMode.h"
-#include "minecraft/client/gui/PauseScreen.h"
-#include "Timer.h"
-#include "ProgressRenderer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/particle/ParticleEngine.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "User.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "Options.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/stats/StatsCounter.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "minecraft/server/level/SurvivalMode.h"
-#include "minecraft/client/renderer/Chunk.h"
-#include "minecraft/server/level/CreativeMode.h"
-#include "minecraft/client/level/DemoLevel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "DemoUser.h"
-#include "minecraft/client/gui/particle/GuiParticles.h"
-#include "minecraft/client/gui/Screen.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "Options.h"
+#include "ProgressRenderer.h"
+#include "Timer.h"
+#include "User.h"
 #include "minecraft/client/gui/DeathScreen.h"
 #include "minecraft/client/gui/ErrorScreen.h"
-#include "minecraft/client/title/TitleScreen.h"
+#include "minecraft/client/gui/PauseScreen.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/gui/inventory/InventoryScreen.h"
+#include "minecraft/client/gui/particle/GuiParticles.h"
+#include "minecraft/client/level/DemoLevel.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Chunk.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/client/title/TitleScreen.h"
+#include "minecraft/server/level/CreativeMode.h"
+#include "minecraft/server/level/GameMode.h"
+#include "minecraft/server/level/SurvivalMode.h"
+#include "minecraft/stats/StatsCounter.h"
 #if defined(ENABLE_JAVA_GUIS)
 #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h"
 #endif
-#include "minecraft/client/gui/InBedChatScreen.h"
-#include "minecraft/client/gui/achievement/AchievementPopup.h"
-#include "minecraft/client/player/Input.h"
-#include "minecraft/client/renderer/culling/FrustumCuller.h"
+#include "4J_Input.h"
 #include "Camera.h"
-
-#include "minecraft/world/effect/MobEffect.h"
-#include "minecraft/world/Difficulty.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "java/File.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/net.minecraft.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "java/System.h"
-#include "java/ByteBuffer.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/StaticConstructors.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/world/level/levelgen/HellRandomLevelSource.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h"
-#include "minecraft/world/entity/npc/Villager.h"
-#include "minecraft/world/level/chunk/SparseLightStorage.h"
-#include "minecraft/world/level/chunk/SparseDataStorage.h"
-#include "minecraft/world/level/tile/entity/ChestTileEntity.h"
-#include "minecraft/client/renderer/texture/TextureManager.h"
-#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
-#include "Minecraft.Client/Common/src/UI/UIFontData.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "minecraft/client/gui/Font.h"
-#include "Minecraft.Client/include/stubs.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/MemoryTracker.h"
-#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
-#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "4J_Input.h"
+#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
+#include "Minecraft.Client/Common/src/UI/UIFontData.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/ByteBuffer.h"
+#include "java/File.h"
+#include "java/System.h"
+#include "minecraft/StaticConstructors.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/gui/InBedChatScreen.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/gui/achievement/AchievementPopup.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/player/Input.h"
+#include "minecraft/client/renderer/culling/FrustumCuller.h"
+#include "minecraft/client/renderer/texture/TextureManager.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/Difficulty.h"
+#include "minecraft/world/effect/MobEffect.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/npc/Villager.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/chunk/SparseDataStorage.h"
+#include "minecraft/world/level/chunk/SparseLightStorage.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
+#include "minecraft/world/level/levelgen/HellRandomLevelSource.h"
+#include "minecraft/world/level/levelgen/structure/StrongholdFeature.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "minecraft/world/level/tile/entity/ChestTileEntity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
 
 // #define DISABLE_SPU_CODE
 // 4J Turning this on will change the graph at the bottom of the debug overlay
diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h
index df67c04bb..6c383f465 100644
--- a/targets/minecraft/client/Minecraft.h
+++ b/targets/minecraft/client/Minecraft.h
@@ -40,11 +40,11 @@ class ColourTable;
 class MultiPlayerGameMode;
 class LivingEntity;
 
-#include "java/File.h"
-#include "minecraft/network/packet/DisconnectPacket.h"
-#include "console_helpers/C4JThread.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "4J.Common/4J_Compat.h"
+#include "console_helpers/C4JThread.h"
+#include "java/File.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/network/packet/DisconnectPacket.h"
 
 #if defined(linux)
 #undef linux
diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp
index 3a3a9a7bc..6cfb0bb3c 100644
--- a/targets/minecraft/client/Options.cpp
+++ b/targets/minecraft/client/Options.cpp
@@ -1,20 +1,21 @@
 #include "Options.h"
+
 #include "KeyMapping.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/locale/Language.h"
-#include "java/File.h"
-#include "java/InputOutputStream/BufferedReader.h"
-#include "java/InputOutputStream/InputStreamReader.h"
-#include "java/InputOutputStream/FileInputStream.h"
-#include "java/InputOutputStream/FileOutputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/locale/I18n.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/File.h"
+#include "java/InputOutputStream/BufferedReader.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "java/InputOutputStream/FileInputStream.h"
+#include "java/InputOutputStream/FileOutputStream.h"
+#include "java/InputOutputStream/InputStreamReader.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/locale/I18n.h"
+#include "minecraft/locale/Language.h"
 
 // 4J - the Option sub-class used to be an java enumerated type, trying to
 // emulate that functionality here
diff --git a/targets/minecraft/client/ProgressRenderer.cpp b/targets/minecraft/client/ProgressRenderer.cpp
index 89d1d64f6..9b6b27806 100644
--- a/targets/minecraft/client/ProgressRenderer.cpp
+++ b/targets/minecraft/client/ProgressRenderer.cpp
@@ -1,4 +1,5 @@
 #include "ProgressRenderer.h"
+
 #include "java/System.h"
 #include "minecraft/client/Minecraft.h"
 
diff --git a/targets/minecraft/client/ProgressRenderer.h b/targets/minecraft/client/ProgressRenderer.h
index 2bd436198..ecec96d8d 100644
--- a/targets/minecraft/client/ProgressRenderer.h
+++ b/targets/minecraft/client/ProgressRenderer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <mutex>
 #include <string>
 
diff --git a/targets/minecraft/client/Timer.cpp b/targets/minecraft/client/Timer.cpp
index 87c539c49..8e1a16c7e 100644
--- a/targets/minecraft/client/Timer.cpp
+++ b/targets/minecraft/client/Timer.cpp
@@ -1,4 +1,5 @@
 #include "Timer.h"
+
 #include "java/System.h"
 
 Timer::Timer(float ticksPerSecond) {
diff --git a/targets/minecraft/client/User.cpp b/targets/minecraft/client/User.cpp
index 6efd1ff35..65d3a7813 100644
--- a/targets/minecraft/client/User.cpp
+++ b/targets/minecraft/client/User.cpp
@@ -1,6 +1,7 @@
+#include "User.h"
+
 #include <vector>
 
-#include "User.h"
 #include "minecraft/world/level/tile/HalfSlabTile.h"
 #include "minecraft/world/level/tile/LeafTile.h"
 #include "minecraft/world/level/tile/PlantTile.h"
diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp
index d6a8a4d50..7d8852b79 100644
--- a/targets/minecraft/client/gui/ChatScreen.cpp
+++ b/targets/minecraft/client/gui/ChatScreen.cpp
@@ -1,13 +1,14 @@
+#include "ChatScreen.h"
+
 #include <memory>
 
-#include "ChatScreen.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/SharedConstants.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Gui.h"
 #include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
 const std::wstring ChatScreen::allowedChars =
     SharedConstants::acceptableLetters;
diff --git a/targets/minecraft/client/gui/ConfirmScreen.cpp b/targets/minecraft/client/gui/ConfirmScreen.cpp
index 7e01e1b56..184efc3e3 100644
--- a/targets/minecraft/client/gui/ConfirmScreen.cpp
+++ b/targets/minecraft/client/gui/ConfirmScreen.cpp
@@ -1,10 +1,11 @@
+#include "ConfirmScreen.h"
+
 #include <vector>
 
-#include "ConfirmScreen.h"
 #include "SmallButton.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"
 
 ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1,
                              const std::wstring& title2, int id) {
diff --git a/targets/minecraft/client/gui/ControlsScreen.cpp b/targets/minecraft/client/gui/ControlsScreen.cpp
index 462e6a5c4..19439f026 100644
--- a/targets/minecraft/client/gui/ControlsScreen.cpp
+++ b/targets/minecraft/client/gui/ControlsScreen.cpp
@@ -1,12 +1,13 @@
+#include "ControlsScreen.h"
+
 #include <vector>
 
-#include "ControlsScreen.h"
-#include "minecraft/client/Options.h"
 #include "SmallButton.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"
 
 ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) {
     // 4J - added initialisers
diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp
index b3c01fe0a..081eeb329 100644
--- a/targets/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp
@@ -1,32 +1,34 @@
+#include "CreateWorldScreen.h"
+
 #include <stddef.h>
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "CreateWorldScreen.h"
-#include "EditBox.h"
-#include "Button.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/Options.h"
-#include "MessageScreen.h"
 #include "4J_Storage.h"
+#include "Button.h"
+#include "EditBox.h"
+#include "MessageScreen.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/locale/Language.h"
+#include "minecraft/server/MinecraftServer.h"
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
 
 CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) {
     done = false;  // 4J added
diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp
index 9e61223ec..41dbb031e 100644
--- a/targets/minecraft/client/gui/DeathScreen.cpp
+++ b/targets/minecraft/client/gui/DeathScreen.cpp
@@ -1,15 +1,16 @@
+#include "DeathScreen.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "console_helpers/StringHelpers.h"
-#include "DeathScreen.h"
-#include "Button.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "PauseScreen.h"
 #include "4J.Render/4J_Render.h"
+#include "Button.h"
+#include "PauseScreen.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
 void DeathScreen::init() {
     buttons.clear();
diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp
index 0fe146deb..d5dca214b 100644
--- a/targets/minecraft/client/gui/EditBox.cpp
+++ b/targets/minecraft/client/gui/EditBox.cpp
@@ -1,7 +1,8 @@
 #include "EditBox.h"
+
+#include "Minecraft.Client/include/stubs.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
 
 EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width,
                  int height, const std::wstring& value) {
diff --git a/targets/minecraft/client/gui/EnchantmentScreen.cpp b/targets/minecraft/client/gui/EnchantmentScreen.cpp
index 47ccadc5d..17082c13f 100644
--- a/targets/minecraft/client/gui/EnchantmentScreen.cpp
+++ b/targets/minecraft/client/gui/EnchantmentScreen.cpp
@@ -1,21 +1,22 @@
-#include <memory>
-#include <string>
-#include <iterator>
-#include <algorithm>
-#include <sstream>
-
 #include "EnchantmentScreen.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "minecraft/world/inventory/Slot.h"
+
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <sstream>
+#include <string>
+
 #include "minecraft/client/Minecraft.h"
-#include "minecraft/locale/Language.h"
-#include "minecraft/world/entity/player/Abilities.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/inventory/EnchantmentMenu.h"
+#include "minecraft/world/inventory/Slot.h"
+#include "minecraft/world/item/ItemInstance.h"
 
 class Level;
 
diff --git a/targets/minecraft/client/gui/EnchantmentScreen.h b/targets/minecraft/client/gui/EnchantmentScreen.h
index d6a184d61..565885fbd 100644
--- a/targets/minecraft/client/gui/EnchantmentScreen.h
+++ b/targets/minecraft/client/gui/EnchantmentScreen.h
@@ -4,9 +4,9 @@
 #include <string>
 #include <vector>
 
+#include "java/Random.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/inventory/EnchantmentMenu.h"
-#include "java/Random.h"
 
 class EnchantmentMenu;
 class Inventory;
diff --git a/targets/minecraft/client/gui/ErrorScreen.cpp b/targets/minecraft/client/gui/ErrorScreen.cpp
index 1b40a470d..55f88dcc9 100644
--- a/targets/minecraft/client/gui/ErrorScreen.cpp
+++ b/targets/minecraft/client/gui/ErrorScreen.cpp
@@ -1,4 +1,5 @@
 #include "ErrorScreen.h"
+
 #include "minecraft/client/gui/Screen.h"
 
 ErrorScreen::ErrorScreen(const std::wstring& title,
diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp
index f1abc9af2..fdc2a6864 100644
--- a/targets/minecraft/client/gui/Font.cpp
+++ b/targets/minecraft/client/gui/Font.cpp
@@ -1,18 +1,20 @@
+#include "Font.h"
+
 #include <string.h>
+
 #include <utility>
 #include <vector>
 
-#include "minecraft/client/renderer/Textures.h"
-#include "Font.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "console_helpers/StringHelpers.h"
-#include "java/Random.h"
-#include "minecraft/client/gui/Font.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/include/BufferedImage.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 
 Font::Font(Options* options, const std::wstring& name, Textures* textures,
            bool enforceUnicode, ResourceLocation* textureLocation, int cols,
diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp
index eac17ad34..5a995558f 100644
--- a/targets/minecraft/client/gui/Gui.cpp
+++ b/targets/minecraft/client/gui/Gui.cpp
@@ -1,44 +1,44 @@
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "Gui.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/server/level/GameMode.h"
-#include "minecraft/client/Lighting.h"
+
+#include "4J.Common/4J_Compat.h"
 #include "ChatScreen.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/JavaMath.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "java/System.h"
+#include "minecraft/client/ClientConstants.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/server/level/GameMode.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/food/net.minecraft.world.food.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "java/System.h"
-#include "minecraft/locale/Language.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/client/renderer/entity/EnderDragonRenderer.h"
-#include "minecraft/net.minecraft.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
-#include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/ClientConstants.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/util/Mth.h"
-#include "console_helpers/StringHelpers.h"
-#include "4J.Common/4J_Compat.h"
 
 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
     ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);
diff --git a/targets/minecraft/client/gui/Gui.h b/targets/minecraft/client/gui/Gui.h
index ffb01f1b6..d7aacd312 100644
--- a/targets/minecraft/client/gui/Gui.h
+++ b/targets/minecraft/client/gui/Gui.h
@@ -1,8 +1,11 @@
 #pragma once
 #include <cstddef>
+
+#include "4J.Common/4J_Compat.h"
 #include "GuiComponent.h"
 #include "minecraft/client/GuiMessage.h"
 #include "minecraft/client/renderer/entity/ItemRenderer.h"
+
 class Random;
 class Minecraft;
 
diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp
index 5d90a0b2c..5d524ebb6 100644
--- a/targets/minecraft/client/gui/GuiComponent.cpp
+++ b/targets/minecraft/client/gui/GuiComponent.cpp
@@ -1,13 +1,14 @@
+#include "GuiComponent.h"
+
 #include <GL/gl.h>
 #include <math.h>
 
-#include "GuiComponent.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/Gui.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/renderer/Tesselator.h"
 
 void GuiComponent::hLine(int x0, int x1, int y, int col) {
     if (x1 < x0) {
diff --git a/targets/minecraft/client/gui/HopperScreen.cpp b/targets/minecraft/client/gui/HopperScreen.cpp
index 9d0c8b448..d8fb9c23e 100644
--- a/targets/minecraft/client/gui/HopperScreen.cpp
+++ b/targets/minecraft/client/gui/HopperScreen.cpp
@@ -1,11 +1,12 @@
+#include "HopperScreen.h"
+
 #include <string>
 
-#include "HopperScreen.h"
 #include "Font.h"
-#include "minecraft/world/inventory/HopperMenu.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/inventory/HopperMenu.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing
 // container classes
diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp
index efb838454..0c9b69bee 100644
--- a/targets/minecraft/client/gui/InBedChatScreen.cpp
+++ b/targets/minecraft/client/gui/InBedChatScreen.cpp
@@ -1,15 +1,16 @@
+#include "InBedChatScreen.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "InBedChatScreen.h"
 #include "Button.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/ChatScreen.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/locale/Language.h"
 
 void InBedChatScreen::init() {
     Keyboard::enableRepeatEvents(true);
diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
index 859d3e9fa..abb5c3833 100644
--- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
+++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
@@ -1,14 +1,15 @@
+#include "JoinMultiplayerScreen.h"
+
 #include <vector>
 
-#include "JoinMultiplayerScreen.h"
 #include "Button.h"
 #include "EditBox.h"
-#include "minecraft/client/Options.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/locale/Language.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Screen.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"
 
 JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) {
     ipEdit = nullptr;
diff --git a/targets/minecraft/client/gui/MerchantScreen.cpp b/targets/minecraft/client/gui/MerchantScreen.cpp
index 62ae9df34..37a520934 100644
--- a/targets/minecraft/client/gui/MerchantScreen.cpp
+++ b/targets/minecraft/client/gui/MerchantScreen.cpp
@@ -1,22 +1,23 @@
+#include "MerchantScreen.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "MerchantScreen.h"
 #include "TradeSwitchButton.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/inventory/MerchantMenu.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/inventory/MerchantMenu.h"
 #include "minecraft/world/item/trading/Merchant.h"
 #include "minecraft/world/item/trading/MerchantRecipeList.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 class Level;
 
diff --git a/targets/minecraft/client/gui/MessageScreen.cpp b/targets/minecraft/client/gui/MessageScreen.cpp
index 505994470..933657fa9 100644
--- a/targets/minecraft/client/gui/MessageScreen.cpp
+++ b/targets/minecraft/client/gui/MessageScreen.cpp
@@ -1,6 +1,7 @@
+#include "MessageScreen.h"
+
 #include <vector>
 
-#include "MessageScreen.h"
 #include "minecraft/client/gui/Screen.h"
 
 MessageScreen::MessageScreen(const std::wstring& message) {
diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp
index dab01593f..c89d25c81 100644
--- a/targets/minecraft/client/gui/Minimap.cpp
+++ b/targets/minecraft/client/gui/Minimap.cpp
@@ -1,18 +1,20 @@
+#include "Minimap.h"
+
 #include <GL/gl.h>
 #include <math.h>
 #include <wchar.h>
+
 #include <string>
 
-#include "minecraft/client/Minecraft.h"
-#include "Minimap.h"
-#include "Font.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J.Render/4J_Render.h"
-#include "Minecraft.Client/include/BufferedImage.h"
+#include "Font.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/material/MaterialColor.h"
 #include "minecraft/world/level/saveddata/MapItemSavedData.h"
diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp
index 428106860..51dffc9bf 100644
--- a/targets/minecraft/client/gui/NameEntryScreen.cpp
+++ b/targets/minecraft/client/gui/NameEntryScreen.cpp
@@ -1,11 +1,12 @@
+#include "NameEntryScreen.h"
+
 #include <vector>
 
-#include "NameEntryScreen.h"
 #include "Button.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
 
 const std::wstring NameEntryScreen::allowedChars =
     L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 "
diff --git a/targets/minecraft/client/gui/OptionsScreen.cpp b/targets/minecraft/client/gui/OptionsScreen.cpp
index e0e3d4926..9aa855932 100644
--- a/targets/minecraft/client/gui/OptionsScreen.cpp
+++ b/targets/minecraft/client/gui/OptionsScreen.cpp
@@ -1,15 +1,16 @@
+#include "OptionsScreen.h"
+
 #include <vector>
 
-#include "OptionsScreen.h"
-#include "SmallButton.h"
-#include "SlideButton.h"
-#include "minecraft/client/Options.h"
 #include "ControlsScreen.h"
+#include "SlideButton.h"
+#include "SmallButton.h"
 #include "VideoSettingsScreen.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"
 
 OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) {
     title = L"Options";  // 4J added
diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp
index d68b169d8..ca6a1d333 100644
--- a/targets/minecraft/client/gui/PauseScreen.cpp
+++ b/targets/minecraft/client/gui/PauseScreen.cpp
@@ -1,23 +1,25 @@
+#include "PauseScreen.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
 #include <vector>
 
-#include "PauseScreen.h"
+#include "4J_Input.h"
+#include "4J_Profile.h"
 #include "Button.h"
 #include "MessageScreen.h"
-#include "OptionsScreen.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "4J_Profile.h"
-#include "4J_Input.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/locale/I18n.h"
+#include "OptionsScreen.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/locale/I18n.h"
+#include "minecraft/server/MinecraftServer.h"
 
 PauseScreen::PauseScreen() {
     saveStep = 0;
diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp
index 01250b27d..a7de15bb0 100644
--- a/targets/minecraft/client/gui/RenameWorldScreen.cpp
+++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp
@@ -1,14 +1,15 @@
+#include "RenameWorldScreen.h"
+
 #include <vector>
 
-#include "RenameWorldScreen.h"
-#include "EditBox.h"
 #include "Button.h"
+#include "EditBox.h"
+#include "Minecraft.Client/include/stubs.h"
 #include "console_helpers/StringHelpers.h"
-#include "minecraft/locale/Language.h"
-#include "minecraft/world/level/storage/LevelStorageSource.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/world/level/storage/LevelStorageSource.h"
 
 RenameWorldScreen::RenameWorldScreen(Screen* lastScreen,
                                      const std::wstring& levelId) {
diff --git a/targets/minecraft/client/gui/RepairScreen.cpp b/targets/minecraft/client/gui/RepairScreen.cpp
index b244b68dd..c0265f861 100644
--- a/targets/minecraft/client/gui/RepairScreen.cpp
+++ b/targets/minecraft/client/gui/RepairScreen.cpp
@@ -1,23 +1,25 @@
+#include "RepairScreen.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 #include <string>
 
-#include "RepairScreen.h"
-#include "EditBox.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/inventory/AnvilMenu.h"
-#include "minecraft/world/inventory/Slot.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
-#include "minecraft/client/Minecraft.h"
 #include "4J.Render/4J_Render.h"
+#include "EditBox.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/inventory/AnvilMenu.h"
+#include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/InputOutputStream/ByteArrayOutputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 class Inventory;
 class Level;
diff --git a/targets/minecraft/client/gui/RepairScreen.h b/targets/minecraft/client/gui/RepairScreen.h
index abedae8df..2eea6e00d 100644
--- a/targets/minecraft/client/gui/RepairScreen.h
+++ b/targets/minecraft/client/gui/RepairScreen.h
@@ -3,9 +3,9 @@
 #include <memory>
 
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/AnvilMenu.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"
 
 class EditBox;
 class AnvilMenu;
diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp
index 431497c40..78eba4fba 100644
--- a/targets/minecraft/client/gui/Screen.cpp
+++ b/targets/minecraft/client/gui/Screen.cpp
@@ -1,16 +1,17 @@
 #include "Screen.h"
-#include "Button.h"
-#include "minecraft/client/gui/particle/GuiParticles.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/client/gui/Screen.h"
-#include "4J_Profile.h"
+
 #include "4J_Input.h"
+#include "4J_Profile.h"
+#include "Button.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/particle/GuiParticles.h"
+#include "minecraft/sounds/SoundTypes.h"
 
 Screen::Screen()  // 4J added
 {
diff --git a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp
index 03dc7d35d..d782e5d8e 100644
--- a/targets/minecraft/client/gui/ScreenSizeCalculator.cpp
+++ b/targets/minecraft/client/gui/ScreenSizeCalculator.cpp
@@ -1,6 +1,7 @@
+#include "ScreenSizeCalculator.h"
+
 #include <math.h>
 
-#include "ScreenSizeCalculator.h"
 #include "minecraft/client/Options.h"
 #include "minecraft/client/gui/ScreenSizeCalculator.h"
 
diff --git a/targets/minecraft/client/gui/ScrolledSelectionList.cpp b/targets/minecraft/client/gui/ScrolledSelectionList.cpp
index 5b52112bb..6096fd5cd 100644
--- a/targets/minecraft/client/gui/ScrolledSelectionList.cpp
+++ b/targets/minecraft/client/gui/ScrolledSelectionList.cpp
@@ -1,4 +1,5 @@
 #include "ScrolledSelectionList.h"
+
 #include "Button.h"
 
 class Minecraft;
diff --git a/targets/minecraft/client/gui/ScrolledSelectionList.h b/targets/minecraft/client/gui/ScrolledSelectionList.h
index 8c9e2d057..eac363691 100644
--- a/targets/minecraft/client/gui/ScrolledSelectionList.h
+++ b/targets/minecraft/client/gui/ScrolledSelectionList.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp
index c3940c9fd..0a4e77d38 100644
--- a/targets/minecraft/client/gui/SelectWorldScreen.cpp
+++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp
@@ -1,22 +1,24 @@
+#include "SelectWorldScreen.h"
+
 #include <stdint.h>
 #include <wchar.h>
+
 #include <vector>
 
-#include "SelectWorldScreen.h"
+#include "4J_Profile.h"
 #include "Button.h"
 #include "ConfirmScreen.h"
 #include "CreateWorldScreen.h"
-#include "RenameWorldScreen.h"
-#include "4J_Profile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "RenameWorldScreen.h"
 #include "console_helpers/StringHelpers.h"
-#include "minecraft/locale/Language.h"
-#include "minecraft/world/level/storage/LevelStorageSource.h"
-#include "minecraft/world/level/storage/LevelSummary.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/gui/ScrolledSelectionList.h"
+#include "minecraft/locale/Language.h"
+#include "minecraft/world/level/storage/LevelStorageSource.h"
+#include "minecraft/world/level/storage/LevelSummary.h"
 
 SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) {
     // 4J - added initialisers
diff --git a/targets/minecraft/client/gui/SlideButton.cpp b/targets/minecraft/client/gui/SlideButton.cpp
index 7de5084e3..1afa8a9fe 100644
--- a/targets/minecraft/client/gui/SlideButton.cpp
+++ b/targets/minecraft/client/gui/SlideButton.cpp
@@ -1,4 +1,5 @@
 #include "SlideButton.h"
+
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
diff --git a/targets/minecraft/client/gui/SmallButton.cpp b/targets/minecraft/client/gui/SmallButton.cpp
index 1a5732968..a4abc5451 100644
--- a/targets/minecraft/client/gui/SmallButton.cpp
+++ b/targets/minecraft/client/gui/SmallButton.cpp
@@ -1,4 +1,5 @@
 #include "SmallButton.h"
+
 #include "minecraft/client/Options.h"
 #include "minecraft/client/gui/Button.h"
 
diff --git a/targets/minecraft/client/gui/TradeSwitchButton.cpp b/targets/minecraft/client/gui/TradeSwitchButton.cpp
index a0030f349..08f86186e 100644
--- a/targets/minecraft/client/gui/TradeSwitchButton.cpp
+++ b/targets/minecraft/client/gui/TradeSwitchButton.cpp
@@ -1,6 +1,7 @@
+#include "TradeSwitchButton.h"
+
 #include <string>
 
-#include "TradeSwitchButton.h"
 #include "minecraft/client/gui/Button.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
diff --git a/targets/minecraft/client/gui/VideoSettingsScreen.cpp b/targets/minecraft/client/gui/VideoSettingsScreen.cpp
index 7c4021383..864c0a742 100644
--- a/targets/minecraft/client/gui/VideoSettingsScreen.cpp
+++ b/targets/minecraft/client/gui/VideoSettingsScreen.cpp
@@ -1,13 +1,14 @@
+#include "VideoSettingsScreen.h"
+
 #include <vector>
 
-#include "VideoSettingsScreen.h"
-#include "SmallButton.h"
 #include "SlideButton.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/locale/Language.h"
+#include "SmallButton.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/locale/Language.h"
 
 // 4jcraft
 #define ITEM_COUNT 10
diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp
index f1287dce0..0ee9e6d83 100644
--- a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp
+++ b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp
@@ -1,13 +1,14 @@
+#include "AchievementPopup.h"
+
 #include <GL/gl.h>
 
-#include "AchievementPopup.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
-#include "java/System.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/locale/I18n.h"
-#include "minecraft/stats/Achievement.h"
+#include "java/System.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
+#include "minecraft/locale/I18n.h"
+#include "minecraft/stats/Achievement.h"
 
 AchievementPopup::AchievementPopup(Minecraft* mc) {
     // 4J - added initialisers
diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.h b/targets/minecraft/client/gui/achievement/AchievementPopup.h
index 44563515f..a33bf458b 100644
--- a/targets/minecraft/client/gui/achievement/AchievementPopup.h
+++ b/targets/minecraft/client/gui/achievement/AchievementPopup.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <string>
 
 #include "minecraft/client/gui/GuiComponent.h"
diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
index c41752f32..ebfd100c5 100644
--- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
@@ -1,19 +1,21 @@
+#include "AchievementScreen.h"
+
 #include <GL/gl.h>
+
 #include <string>
 #include <vector>
 
-#include "AchievementScreen.h"
-#include "minecraft/client/gui/SmallButton.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/KeyMapping.h"
-#include "minecraft/client/gui/Font.h"
 #include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/KeyMapping.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/SmallButton.h"
 #include "minecraft/locale/I18n.h"
 #include "minecraft/stats/Achievement.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Button.h"
-#include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
 
 AchievementScreen::AchievementScreen(StatsCounter* statsCounter) {
     // 4J - added initialisers
diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.h b/targets/minecraft/client/gui/achievement/AchievementScreen.h
index 348bee5c7..f82e5d702 100644
--- a/targets/minecraft/client/gui/achievement/AchievementScreen.h
+++ b/targets/minecraft/client/gui/achievement/AchievementScreen.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "minecraft/client/gui/Screen.h"
-#include "minecraft/stats/net.minecraft.stats.h"
 #include "minecraft/stats/Achievements.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 
 class StatsCounter;
 
diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp
index cd33cff41..70164cb01 100644
--- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp
@@ -1,20 +1,21 @@
 #include "StatsScreen.h"
-#include "minecraft/stats/StatsCounter.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
+
+#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Font.h"
-#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/ScrolledSelectionList.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "minecraft/locale/I18n.h"
 #include "minecraft/locale/Language.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/ItemStat.h"
 #include "minecraft/stats/Stat.h"
 #include "minecraft/stats/Stats.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/gui/ScrolledSelectionList.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/stats/StatsCounter.h"
 
 class Tesselator;
 
diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp
index 2a0300f7e..8cfb77247 100644
--- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp
+++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp
@@ -1,6 +1,7 @@
+#include "AbstractBeaconButton.h"
+
 #include <string>
 
-#include "AbstractBeaconButton.h"
 #include "minecraft/client/gui/Button.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
index e79964fec..bf55e7ce0 100644
--- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
@@ -1,21 +1,23 @@
+#include "AbstractContainerScreen.h"
+
 #include <wchar.h>
+
 #include <vector>
 
-#include "AbstractContainerScreen.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/KeyMapping.h"
-#include "minecraft/client/Options.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/KeyMapping.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/Rarity.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.Client/include/stubs.h"
 
 ItemRenderer* AbstractContainerScreen::itemRenderer = new ItemRenderer();
 
diff --git a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp
index cb301071e..9071fc97e 100644
--- a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp
+++ b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp
@@ -1,9 +1,10 @@
+#include "BeaconCancelButton.h"
+
 #include <string>
 
-#include "BeaconCancelButton.h"
 #include "BeaconScreen.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/locale/Language.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
diff --git a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp
index 78d684fcf..a3cbf95ba 100644
--- a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp
+++ b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp
@@ -1,9 +1,10 @@
+#include "BeaconConfirmButton.h"
+
 #include <string>
 
-#include "BeaconConfirmButton.h"
 #include "BeaconScreen.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/locale/Language.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp
index fbc041ed5..3c830755a 100644
--- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp
+++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp
@@ -1,10 +1,11 @@
+#include "BeaconPowerButton.h"
+
 #include <string>
 
-#include "BeaconPowerButton.h"
 #include "BeaconScreen.h"
-#include "minecraft/world/effect/MobEffect.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/world/effect/MobEffect.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4)
 #ifdef ENABLE_JAVA_GUIS
diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp
index 762c2cc97..a4510ca8c 100644
--- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp
@@ -1,28 +1,30 @@
+#include "BeaconScreen.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "BeaconScreen.h"
-#include "BeaconConfirmButton.h"
+#include "4J.Render/4J_Render.h"
 #include "BeaconCancelButton.h"
+#include "BeaconConfirmButton.h"
 #include "BeaconPowerButton.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/ClientConnection.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "4J.Render/4J_Render.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/client/multiplayer/ClientConnection.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/network/packet/CustomPayloadPacket.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/BeaconMenu.h"
 #include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
-#include "minecraft/client/gui/Button.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/inventory/AbstractBeaconButton.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing
 // container classes (and iggy too)
diff --git a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp
index ee5c6bbdf..6167f03f2 100644
--- a/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp
@@ -1,12 +1,13 @@
+#include "BrewingStandScreen.h"
+
 #include <memory>
 #include <string>
 
-#include "BrewingStandScreen.h"
-#include "minecraft/world/inventory/BrewingStandMenu.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/inventory/BrewingStandMenu.h"
+#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
 
 // 4jcraft: referenced from MCP 8.11 (JE 1.6.4) and the existing
 // container classes
diff --git a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp
index ac768bd5a..843633fe9 100644
--- a/targets/minecraft/client/gui/inventory/ContainerScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/ContainerScreen.cpp
@@ -1,7 +1,8 @@
 #include "ContainerScreen.h"
+
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/inventory/ContainerMenu.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 ContainerScreen::ContainerScreen(std::shared_ptr<Container> inventory,
                                  std::shared_ptr<Container> container)
diff --git a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp
index 6f19da82d..b2c09a7f4 100644
--- a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp
@@ -1,14 +1,15 @@
+#include "CraftingScreen.h"
+
 #include <string>
 
-#include "CraftingScreen.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/CraftingMenu.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 class Player;
 
diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
index 082d5c622..b9eae28dd 100644
--- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
@@ -1,26 +1,28 @@
+#include "CreativeInventoryScreen.h"
+
 #include <GL/gl.h>
+
 #include <algorithm>
 #include <string>
 
-#include "CreativeInventoryScreen.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/world/SimpleContainer.h"
-#include "minecraft/world/inventory/Slot.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
-#include "minecraft/world/inventory/InventoryMenu.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/world/level/tile/Tile.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
+#include "minecraft/world/SimpleContainer.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/inventory/InventoryMenu.h"
+#include "minecraft/world/inventory/Slot.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 // Static member initialization
 int CreativeInventoryScreen::selectedTabIndex =
diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h
index d024a093c..c13614f0e 100644
--- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h
+++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h
@@ -3,9 +3,9 @@
 #include <vector>
 
 #include "AbstractContainerScreen.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 
 class Player;
 class SimpleContainer;
diff --git a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp
index c125d8790..d47a16921 100644
--- a/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/FurnaceScreen.cpp
@@ -1,11 +1,12 @@
+#include "FurnaceScreen.h"
+
 #include <string>
 
-#include "FurnaceScreen.h"
 #include "minecraft/client/gui/Font.h"
-#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/inventory/FurnaceMenu.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
 
 #ifdef ENABLE_JAVA_GUIS
 ResourceLocation GUI_FURNACE_LOCATION = ResourceLocation(TN_GUI_FURNACE);
diff --git a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp
index 31d68a8e8..19b57cd8e 100644
--- a/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp
@@ -1,11 +1,12 @@
+#include "HorseInventoryScreen.h"
+
 #include <string>
 
-#include "HorseInventoryScreen.h"
-#include "minecraft/world/inventory/HorseInventoryMenu.h"
-#include "minecraft/world/Container.h"
-#include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/Container.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/inventory/HorseInventoryMenu.h"
 
 class EntityHorse;
 
diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp
index be7a1fb80..736f6e179 100644
--- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp
@@ -1,16 +1,17 @@
+#include "InventoryScreen.h"
+
 #include <string>
 #include <vector>
 
-#include "InventoryScreen.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/achievement/AchievementScreen.h"
 #include "minecraft/client/gui/achievement/StatsScreen.h"
+#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
 
 InventoryScreen::InventoryScreen(std::shared_ptr<Player> player)
     : AbstractContainerScreen(player->inventoryMenu) {
diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
index 40c682ea4..cf8d1dab0 100644
--- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
@@ -1,18 +1,19 @@
+#include "TextEditScreen.h"
+
 #include <vector>
 
-#include "TextEditScreen.h"
+#include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/multiplayer/ClientConnection.h"
 #include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/world/level/tile/entity/SignTileEntity.h"
-#include "minecraft/SharedConstants.h"
-#include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
 #include "minecraft/network/packet/SignUpdatePacket.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/include/stubs.h"
+#include "minecraft/world/level/tile/entity/SignTileEntity.h"
 
 const std::wstring TextEditScreen::allowedChars =
     SharedConstants::acceptableLetters;
diff --git a/targets/minecraft/client/gui/inventory/TrapScreen.cpp b/targets/minecraft/client/gui/inventory/TrapScreen.cpp
index 25af93f6e..1ab57f0c9 100644
--- a/targets/minecraft/client/gui/inventory/TrapScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/TrapScreen.cpp
@@ -1,11 +1,12 @@
+#include "TrapScreen.h"
+
 #include <string>
 
-#include "TrapScreen.h"
-#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
-#include "minecraft/world/entity/player/Inventory.h"
-#include "minecraft/world/inventory/TrapMenu.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/inventory/AbstractContainerScreen.h"
+#include "minecraft/world/entity/player/Inventory.h"
+#include "minecraft/world/inventory/TrapMenu.h"
+#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
 
 #ifdef ENABLE_JAVA_GUIS
 ResourceLocation GUI_TRAP_LOCATION = ResourceLocation(TN_GUI_TRAP);
diff --git a/targets/minecraft/client/gui/inventory/TrapScreen.h b/targets/minecraft/client/gui/inventory/TrapScreen.h
index ae2b02c89..8d1341b54 100644
--- a/targets/minecraft/client/gui/inventory/TrapScreen.h
+++ b/targets/minecraft/client/gui/inventory/TrapScreen.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <memory>
+
 #include "AbstractContainerScreen.h"
 class DispenserTileEntity;
 class Inventory;
diff --git a/targets/minecraft/client/gui/particle/GuiParticle.cpp b/targets/minecraft/client/gui/particle/GuiParticle.cpp
index e167abb63..c65d5006a 100644
--- a/targets/minecraft/client/gui/particle/GuiParticle.cpp
+++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp
@@ -1,6 +1,7 @@
 #include "GuiParticle.h"
-#include "java/Random.h"
+
 #include "Minecraft.Client/include/stubs.h"
+#include "java/Random.h"
 
 Random* GuiParticle::random = new Random();
 
diff --git a/targets/minecraft/client/gui/particle/GuiParticles.cpp b/targets/minecraft/client/gui/particle/GuiParticles.cpp
index faf2c90bb..28d777378 100644
--- a/targets/minecraft/client/gui/particle/GuiParticles.cpp
+++ b/targets/minecraft/client/gui/particle/GuiParticles.cpp
@@ -1,4 +1,5 @@
 #include "GuiParticles.h"
+
 #include "GuiParticle.h"
 
 GuiParticles::GuiParticles(Minecraft* mc) { this->mc = mc; }
diff --git a/targets/minecraft/client/level/DemoLevel.cpp b/targets/minecraft/client/level/DemoLevel.cpp
index 9b630bf70..cd8df19a1 100644
--- a/targets/minecraft/client/level/DemoLevel.cpp
+++ b/targets/minecraft/client/level/DemoLevel.cpp
@@ -1,4 +1,5 @@
 #include "DemoLevel.h"
+
 #include "minecraft/world/level/LevelSettings.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
diff --git a/targets/minecraft/client/level/DemoLevel.h b/targets/minecraft/client/level/DemoLevel.h
index b3c0a3b49..3c2582086 100644
--- a/targets/minecraft/client/level/DemoLevel.h
+++ b/targets/minecraft/client/level/DemoLevel.h
@@ -1,10 +1,11 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 
 class Dimension;
 class LevelSettings;
diff --git a/targets/minecraft/client/model/BatModel.cpp b/targets/minecraft/client/model/BatModel.cpp
index 940e2e952..edd6532af 100644
--- a/targets/minecraft/client/model/BatModel.cpp
+++ b/targets/minecraft/client/model/BatModel.cpp
@@ -1,12 +1,13 @@
+#include "BatModel.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "BatModel.h"
+#include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ambient/Bat.h"
-#include "minecraft/client/model/geom/Model.h"
 
 BatModel::BatModel() : Model() {
     texWidth = 64;
diff --git a/targets/minecraft/client/model/BlazeModel.cpp b/targets/minecraft/client/model/BlazeModel.cpp
index 46450a6f8..5cfe5af0b 100644
--- a/targets/minecraft/client/model/BlazeModel.cpp
+++ b/targets/minecraft/client/model/BlazeModel.cpp
@@ -1,10 +1,12 @@
+#include "BlazeModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "BlazeModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 BlazeModel::BlazeModel() : Model() {
     upperBodyParts = std::vector<ModelPart*>(12);
diff --git a/targets/minecraft/client/model/BoatModel.cpp b/targets/minecraft/client/model/BoatModel.cpp
index c95211f04..00c0e3f04 100644
--- a/targets/minecraft/client/model/BoatModel.cpp
+++ b/targets/minecraft/client/model/BoatModel.cpp
@@ -1,7 +1,8 @@
+#include "BoatModel.h"
+
 #include <memory>
 #include <numbers>
 
-#include "BoatModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
diff --git a/targets/minecraft/client/model/BookModel.cpp b/targets/minecraft/client/model/BookModel.cpp
index 655e7e5f5..8ceb92602 100644
--- a/targets/minecraft/client/model/BookModel.cpp
+++ b/targets/minecraft/client/model/BookModel.cpp
@@ -1,8 +1,10 @@
+#include "BookModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "BookModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
 BookModel::BookModel() {
diff --git a/targets/minecraft/client/model/ChestModel.cpp b/targets/minecraft/client/model/ChestModel.cpp
index 6be5cc22e..1c4200673 100644
--- a/targets/minecraft/client/model/ChestModel.cpp
+++ b/targets/minecraft/client/model/ChestModel.cpp
@@ -1,6 +1,7 @@
+#include "ChestModel.h"
+
 #include <GL/gl.h>
 
-#include "ChestModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
 ChestModel::ChestModel() {
diff --git a/targets/minecraft/client/model/ChickenModel.cpp b/targets/minecraft/client/model/ChickenModel.cpp
index 7eb8d0fc6..a87456099 100644
--- a/targets/minecraft/client/model/ChickenModel.cpp
+++ b/targets/minecraft/client/model/ChickenModel.cpp
@@ -1,11 +1,13 @@
+#include "ChickenModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "ChickenModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 ChickenModel::ChickenModel() : Model() {
     int yo = 16;
diff --git a/targets/minecraft/client/model/CowModel.cpp b/targets/minecraft/client/model/CowModel.cpp
index 453450636..b87b9dfae 100644
--- a/targets/minecraft/client/model/CowModel.cpp
+++ b/targets/minecraft/client/model/CowModel.cpp
@@ -1,6 +1,7 @@
 #include "CowModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
+
 #include "minecraft/client/model/QuadrupedModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 CowModel::CowModel() : QuadrupedModel(12, 0) {
     head = new ModelPart(this, 0, 0);
diff --git a/targets/minecraft/client/model/CreeperModel.cpp b/targets/minecraft/client/model/CreeperModel.cpp
index f45051c6a..4802487b3 100644
--- a/targets/minecraft/client/model/CreeperModel.cpp
+++ b/targets/minecraft/client/model/CreeperModel.cpp
@@ -1,10 +1,12 @@
+#include "CreeperModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "CreeperModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 // 4J - added
 void CreeperModel::_init(float g) {
diff --git a/targets/minecraft/client/model/EndermanModel.cpp b/targets/minecraft/client/model/EndermanModel.cpp
index 4f22f09f7..b20f6cd9a 100644
--- a/targets/minecraft/client/model/EndermanModel.cpp
+++ b/targets/minecraft/client/model/EndermanModel.cpp
@@ -1,8 +1,9 @@
+#include "EndermanModel.h"
+
 #include <memory>
 
-#include "EndermanModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 EndermanModel::EndermanModel() : HumanoidModel(0, -14, 64, 32) {
     carrying = false;
diff --git a/targets/minecraft/client/model/GhastModel.cpp b/targets/minecraft/client/model/GhastModel.cpp
index c8f525d61..0c0642e43 100644
--- a/targets/minecraft/client/model/GhastModel.cpp
+++ b/targets/minecraft/client/model/GhastModel.cpp
@@ -1,11 +1,13 @@
+#include "GhastModel.h"
+
 #include <math.h>
+
 #include <memory>
 
-#include "java/Random.h"
-#include "GhastModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
+#include "java/Random.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 GhastModel::GhastModel() : Model() {
     int yoffs = -16;
diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp
index f0bc6bcf7..155b83399 100644
--- a/targets/minecraft/client/model/HumanoidModel.cpp
+++ b/targets/minecraft/client/model/HumanoidModel.cpp
@@ -1,15 +1,16 @@
+#include "HumanoidModel.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "HumanoidModel.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/client/model/HumanoidModel.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/model/HumanoidModel.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Entity.h"
 
 // 4J added
 
diff --git a/targets/minecraft/client/model/HumanoidModel.h b/targets/minecraft/client/model/HumanoidModel.h
index 9f6edbba1..227506eca 100644
--- a/targets/minecraft/client/model/HumanoidModel.h
+++ b/targets/minecraft/client/model/HumanoidModel.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/client/model/geom/Model.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/client/model/geom/Model.h"
 
 class ModelPart;
 
diff --git a/targets/minecraft/client/model/LargeChestModel.cpp b/targets/minecraft/client/model/LargeChestModel.cpp
index d8eead0a5..7140eb9f7 100644
--- a/targets/minecraft/client/model/LargeChestModel.cpp
+++ b/targets/minecraft/client/model/LargeChestModel.cpp
@@ -1,4 +1,5 @@
 #include "LargeChestModel.h"
+
 #include "minecraft/client/model/geom/ModelPart.h"
 
 LargeChestModel::LargeChestModel() {
diff --git a/targets/minecraft/client/model/LavaSlimeModel.cpp b/targets/minecraft/client/model/LavaSlimeModel.cpp
index 92065677b..2200449dc 100644
--- a/targets/minecraft/client/model/LavaSlimeModel.cpp
+++ b/targets/minecraft/client/model/LavaSlimeModel.cpp
@@ -1,9 +1,10 @@
+#include "LavaSlimeModel.h"
+
 #include <memory>
 
-#include "LavaSlimeModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/world/entity/monster/LavaSlime.h"
 #include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/LavaSlime.h"
 
 LavaSlimeModel::LavaSlimeModel() {
     for (int i = 0; i < BODYCUBESLENGTH; i++) {
diff --git a/targets/minecraft/client/model/LeashKnotModel.cpp b/targets/minecraft/client/model/LeashKnotModel.cpp
index 509461a9c..8cc2485d1 100644
--- a/targets/minecraft/client/model/LeashKnotModel.cpp
+++ b/targets/minecraft/client/model/LeashKnotModel.cpp
@@ -1,9 +1,10 @@
+#include "LeashKnotModel.h"
+
 #include <memory>
 #include <numbers>
 
-#include "LeashKnotModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 LeashKnotModel::LeashKnotModel() { _init(0, 0, 32, 32); }
 
diff --git a/targets/minecraft/client/model/MinecartModel.cpp b/targets/minecraft/client/model/MinecartModel.cpp
index 2a2c87eb7..52b89f2ad 100644
--- a/targets/minecraft/client/model/MinecartModel.cpp
+++ b/targets/minecraft/client/model/MinecartModel.cpp
@@ -1,9 +1,10 @@
+#include "MinecartModel.h"
+
 #include <memory>
 #include <numbers>
 
-#include "MinecartModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 MinecartModel::MinecartModel() : Model() {
     cubes[0] = new ModelPart(this, 0, 10);
diff --git a/targets/minecraft/client/model/ModelHorse.cpp b/targets/minecraft/client/model/ModelHorse.cpp
index 4239c5ed0..e7307a877 100644
--- a/targets/minecraft/client/model/ModelHorse.cpp
+++ b/targets/minecraft/client/model/ModelHorse.cpp
@@ -1,17 +1,17 @@
+#include "ModelHorse.h"
+
 #include <algorithm>
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "minecraft/util/Mth.h"
-#include "ModelHorse.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
-#include "minecraft/client/model/geom/Model.h"
-#include "minecraft/util/Mth.h"
 
 ModelHorse::ModelHorse() {
     texWidth = 128;
diff --git a/targets/minecraft/client/model/OcelotModel.cpp b/targets/minecraft/client/model/OcelotModel.cpp
index 5b99b8fff..1568e4a68 100644
--- a/targets/minecraft/client/model/OcelotModel.cpp
+++ b/targets/minecraft/client/model/OcelotModel.cpp
@@ -1,11 +1,13 @@
+#include "OcelotModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "OcelotModel.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Ocelot.h"
 
diff --git a/targets/minecraft/client/model/PigModel.cpp b/targets/minecraft/client/model/PigModel.cpp
index 512af6ece..bb5be67d1 100644
--- a/targets/minecraft/client/model/PigModel.cpp
+++ b/targets/minecraft/client/model/PigModel.cpp
@@ -1,6 +1,7 @@
 #include "PigModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
+
 #include "minecraft/client/model/QuadrupedModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 PigModel::PigModel() : QuadrupedModel(6, 0) {
     head->texOffs(16, 16)->addBox(-2.0f, 0.0f, -9.0f, 4, 3, 1, 0.0f);
diff --git a/targets/minecraft/client/model/Polygon.cpp b/targets/minecraft/client/model/Polygon.cpp
index 0aeba7483..8ce3c9ca9 100644
--- a/targets/minecraft/client/model/Polygon.cpp
+++ b/targets/minecraft/client/model/Polygon.cpp
@@ -1,11 +1,12 @@
+#include "Polygon.h"
+
 #include <algorithm>
 #include <span>
 #include <vector>
 
 #include "Vertex.h"
-#include "Polygon.h"
-#include "minecraft/world/phys/Vec3.h"
 #include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/world/phys/Vec3.h"
 
 _Polygon::_Polygon(const std::span<const Vertex> vertices)
     : vertexCount(vertices.size()),
diff --git a/targets/minecraft/client/model/QuadrupedModel.cpp b/targets/minecraft/client/model/QuadrupedModel.cpp
index 8c964e1a0..c7b7aa946 100644
--- a/targets/minecraft/client/model/QuadrupedModel.cpp
+++ b/targets/minecraft/client/model/QuadrupedModel.cpp
@@ -1,11 +1,13 @@
+#include "QuadrupedModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "QuadrupedModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 QuadrupedModel::QuadrupedModel(int legSize, float g) : Model() {
     yHeadOffs = 8;
diff --git a/targets/minecraft/client/model/SheepFurModel.cpp b/targets/minecraft/client/model/SheepFurModel.cpp
index 4af8ae288..8f52060a9 100644
--- a/targets/minecraft/client/model/SheepFurModel.cpp
+++ b/targets/minecraft/client/model/SheepFurModel.cpp
@@ -1,10 +1,11 @@
+#include "SheepFurModel.h"
+
 #include <memory>
 
-#include "SheepFurModel.h"
+#include "minecraft/client/model/QuadrupedModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Sheep.h"
-#include "minecraft/client/model/QuadrupedModel.h"
 
 SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0) {
     headXRot = 0.0f;
diff --git a/targets/minecraft/client/model/SheepModel.cpp b/targets/minecraft/client/model/SheepModel.cpp
index 604c45d1b..1eae65882 100644
--- a/targets/minecraft/client/model/SheepModel.cpp
+++ b/targets/minecraft/client/model/SheepModel.cpp
@@ -1,10 +1,11 @@
+#include "SheepModel.h"
+
 #include <memory>
 
-#include "SheepModel.h"
+#include "minecraft/client/model/QuadrupedModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Sheep.h"
-#include "minecraft/client/model/QuadrupedModel.h"
 
 SheepModel::SheepModel() : QuadrupedModel(12, 0) {
     headXRot = 0.0f;
diff --git a/targets/minecraft/client/model/SignModel.cpp b/targets/minecraft/client/model/SignModel.cpp
index b482db29d..706efccba 100644
--- a/targets/minecraft/client/model/SignModel.cpp
+++ b/targets/minecraft/client/model/SignModel.cpp
@@ -1,4 +1,5 @@
 #include "SignModel.h"
+
 #include "minecraft/client/model/geom/ModelPart.h"
 
 SignModel::SignModel() {
diff --git a/targets/minecraft/client/model/SilverfishModel.cpp b/targets/minecraft/client/model/SilverfishModel.cpp
index ad014f29e..be1d5caab 100644
--- a/targets/minecraft/client/model/SilverfishModel.cpp
+++ b/targets/minecraft/client/model/SilverfishModel.cpp
@@ -1,9 +1,11 @@
+#include "SilverfishModel.h"
+
 #include <math.h>
 #include <stdlib.h>
+
 #include <memory>
 #include <numbers>
 
-#include "SilverfishModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
 const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = {
diff --git a/targets/minecraft/client/model/SkeletonHeadModel.cpp b/targets/minecraft/client/model/SkeletonHeadModel.cpp
index 5ea0f6381..d59000e05 100644
--- a/targets/minecraft/client/model/SkeletonHeadModel.cpp
+++ b/targets/minecraft/client/model/SkeletonHeadModel.cpp
@@ -1,9 +1,10 @@
+#include "SkeletonHeadModel.h"
+
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "SkeletonHeadModel.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 void SkeletonHeadModel::_init(int u, int v, int tw, int th) {
     texWidth = tw;
diff --git a/targets/minecraft/client/model/SkeletonModel.cpp b/targets/minecraft/client/model/SkeletonModel.cpp
index 30bef509e..7fdc4d433 100644
--- a/targets/minecraft/client/model/SkeletonModel.cpp
+++ b/targets/minecraft/client/model/SkeletonModel.cpp
@@ -1,10 +1,11 @@
+#include "SkeletonModel.h"
+
 #include <memory>
 
-#include "SkeletonModel.h"
+#include "minecraft/client/model/ZombieModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/monster/Skeleton.h"
-#include "minecraft/client/model/ZombieModel.h"
 
 void SkeletonModel::_init(float g) {
     arm0 = new ModelPart(this, 24 + 16, 16);
diff --git a/targets/minecraft/client/model/SkiModel.cpp b/targets/minecraft/client/model/SkiModel.cpp
index 617257de2..a30f1b91c 100644
--- a/targets/minecraft/client/model/SkiModel.cpp
+++ b/targets/minecraft/client/model/SkiModel.cpp
@@ -1,7 +1,8 @@
+#include "SkiModel.h"
+
 #include <cmath>
 #include <numbers>
 
-#include "SkiModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
 class Entity;
diff --git a/targets/minecraft/client/model/SlimeModel.cpp b/targets/minecraft/client/model/SlimeModel.cpp
index 40d8fff24..1b5a5fdcd 100644
--- a/targets/minecraft/client/model/SlimeModel.cpp
+++ b/targets/minecraft/client/model/SlimeModel.cpp
@@ -1,6 +1,7 @@
+#include "SlimeModel.h"
+
 #include <memory>
 
-#include "SlimeModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
 SlimeModel::SlimeModel(int vOffs) {
diff --git a/targets/minecraft/client/model/SnowManModel.cpp b/targets/minecraft/client/model/SnowManModel.cpp
index 147db0dfc..801dfef28 100644
--- a/targets/minecraft/client/model/SnowManModel.cpp
+++ b/targets/minecraft/client/model/SnowManModel.cpp
@@ -1,10 +1,12 @@
+#include "SnowManModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "SnowManModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 SnowManModel::SnowManModel() : Model() {
     float yOffset = 4;
diff --git a/targets/minecraft/client/model/SpiderModel.cpp b/targets/minecraft/client/model/SpiderModel.cpp
index 5e74a87c1..1ac005441 100644
--- a/targets/minecraft/client/model/SpiderModel.cpp
+++ b/targets/minecraft/client/model/SpiderModel.cpp
@@ -1,10 +1,11 @@
+#include "SpiderModel.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "SpiderModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 SpiderModel::SpiderModel() : Model() {
     float g = 0;
diff --git a/targets/minecraft/client/model/SquidModel.cpp b/targets/minecraft/client/model/SquidModel.cpp
index 02db9ecfe..6e8106142 100644
--- a/targets/minecraft/client/model/SquidModel.cpp
+++ b/targets/minecraft/client/model/SquidModel.cpp
@@ -1,10 +1,12 @@
+#include "SquidModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "SquidModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 SquidModel::SquidModel() : Model() {
     int yoffs = -16;
diff --git a/targets/minecraft/client/model/VillagerGolemModel.cpp b/targets/minecraft/client/model/VillagerGolemModel.cpp
index 1423b12aa..d51adb10d 100644
--- a/targets/minecraft/client/model/VillagerGolemModel.cpp
+++ b/targets/minecraft/client/model/VillagerGolemModel.cpp
@@ -1,9 +1,10 @@
+#include "VillagerGolemModel.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
 #include "minecraft/client/model/geom/ModelPart.h"
-#include "VillagerGolemModel.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/VillagerGolem.h"
 
diff --git a/targets/minecraft/client/model/VillagerModel.cpp b/targets/minecraft/client/model/VillagerModel.cpp
index 3f2765962..8bf3e130c 100644
--- a/targets/minecraft/client/model/VillagerModel.cpp
+++ b/targets/minecraft/client/model/VillagerModel.cpp
@@ -1,10 +1,12 @@
+#include "VillagerModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "VillagerModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 void VillagerModel::_init(float g, float yOffset, int xTexSize, int yTexSize) {
     head = (new ModelPart(this))->setTexSize(xTexSize, yTexSize);
diff --git a/targets/minecraft/client/model/VillagerZombieModel.cpp b/targets/minecraft/client/model/VillagerZombieModel.cpp
index 63ededb3a..3d5db290a 100644
--- a/targets/minecraft/client/model/VillagerZombieModel.cpp
+++ b/targets/minecraft/client/model/VillagerZombieModel.cpp
@@ -1,10 +1,12 @@
+#include "VillagerZombieModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "VillagerZombieModel.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 void VillagerZombieModel::_init(float g, float yOffset, bool isArmor) {
     delete head;
diff --git a/targets/minecraft/client/model/WitchModel.cpp b/targets/minecraft/client/model/WitchModel.cpp
index 40976d89c..2bd4be833 100644
--- a/targets/minecraft/client/model/WitchModel.cpp
+++ b/targets/minecraft/client/model/WitchModel.cpp
@@ -1,13 +1,13 @@
+#include "WitchModel.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "WitchModel.h"
 #include "VillagerModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
-#include "minecraft/util/Mth.h"
 
 WitchModel::WitchModel(float g) : VillagerModel(g, 0, 64, 128) {
     mole = (new ModelPart(this))->setTexSize(64, 128);
diff --git a/targets/minecraft/client/model/WitherBossModel.cpp b/targets/minecraft/client/model/WitherBossModel.cpp
index 4e1cca8dd..3121d43b7 100644
--- a/targets/minecraft/client/model/WitherBossModel.cpp
+++ b/targets/minecraft/client/model/WitherBossModel.cpp
@@ -1,8 +1,9 @@
+#include "WitherBossModel.h"
+
 #include <cmath>
 
-#include "WitherBossModel.h"
-#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 #include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 
 WitherBossModel::WitherBossModel() {
     texWidth = 64;
diff --git a/targets/minecraft/client/model/WolfModel.cpp b/targets/minecraft/client/model/WolfModel.cpp
index dc5bada17..c95b1eb0a 100644
--- a/targets/minecraft/client/model/WolfModel.cpp
+++ b/targets/minecraft/client/model/WolfModel.cpp
@@ -1,13 +1,15 @@
+#include "WolfModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "WolfModel.h"
-#include "minecraft/world/entity/animal/Wolf.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Wolf.h"
 
 WolfModel::WolfModel() {
     float g = 0;
diff --git a/targets/minecraft/client/model/ZombieModel.cpp b/targets/minecraft/client/model/ZombieModel.cpp
index 2c87414b9..25db4c17c 100644
--- a/targets/minecraft/client/model/ZombieModel.cpp
+++ b/targets/minecraft/client/model/ZombieModel.cpp
@@ -1,10 +1,12 @@
+#include "ZombieModel.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "ZombieModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 
 ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32) {}
 
diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp
index 6d380e017..43ca8b08a 100644
--- a/targets/minecraft/client/model/dragon/DragonModel.cpp
+++ b/targets/minecraft/client/model/dragon/DragonModel.cpp
@@ -1,6 +1,6 @@
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "DragonModel.h"
+
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/boss/enderdragon/EnderDragon.h"
 
diff --git a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp
index 8ce194aaf..76a9d3504 100644
--- a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp
+++ b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp
@@ -1,7 +1,8 @@
+#include "EnderCrystalModel.h"
+
 #include <memory>
 #include <string>
 
-#include "EnderCrystalModel.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/model/geom/ModelPart.h"
 
diff --git a/targets/minecraft/client/model/geom/Cube.cpp b/targets/minecraft/client/model/geom/Cube.cpp
index 28e398447..35705c2ed 100644
--- a/targets/minecraft/client/model/geom/Cube.cpp
+++ b/targets/minecraft/client/model/geom/Cube.cpp
@@ -1,10 +1,11 @@
+#include "Cube.h"
+
 #include <array>
 #include <span>
 
 #include "ModelPart.h"
-#include "minecraft/client/model/Vertex.h"
-#include "Cube.h"
 #include "minecraft/client/model/Polygon.h"
+#include "minecraft/client/model/Vertex.h"
 
 class Tesselator;
 
diff --git a/targets/minecraft/client/model/geom/Cube.h b/targets/minecraft/client/model/geom/Cube.h
index 7341604e9..09aff8df3 100644
--- a/targets/minecraft/client/model/geom/Cube.h
+++ b/targets/minecraft/client/model/geom/Cube.h
@@ -3,8 +3,8 @@
 #include <cstdint>
 #include <string>
 
-#include "minecraft/client/model/Vertex.h"
 #include "minecraft/client/model/Polygon.h"
+#include "minecraft/client/model/Vertex.h"
 
 class Model;
 class ModelPart;
diff --git a/targets/minecraft/client/model/geom/Model.cpp b/targets/minecraft/client/model/geom/Model.cpp
index 4564e91db..1ca9c21e7 100644
--- a/targets/minecraft/client/model/geom/Model.cpp
+++ b/targets/minecraft/client/model/geom/Model.cpp
@@ -1,5 +1,6 @@
-#include "TexOffs.h"
 #include "Model.h"
+
+#include "TexOffs.h"
 #include "minecraft/client/model/geom/Model.h"
 
 Model::Model() {
diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h
index b5f3d8875..e8e61b5aa 100644
--- a/targets/minecraft/client/model/geom/Model.h
+++ b/targets/minecraft/client/model/geom/Model.h
@@ -5,9 +5,8 @@
 #include <unordered_map>
 #include <vector>
 
+#include "Minecraft.Client/include/SkinBox.h"
 #include "java/Random.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 class Mob;
 class ModelPart;
diff --git a/targets/minecraft/client/model/geom/ModelPart.cpp b/targets/minecraft/client/model/geom/ModelPart.cpp
index a7fa8824f..2c025bfd5 100644
--- a/targets/minecraft/client/model/geom/ModelPart.cpp
+++ b/targets/minecraft/client/model/geom/ModelPart.cpp
@@ -1,10 +1,12 @@
+#include "ModelPart.h"
+
 #include <GL/gl.h>
+
 #include <numbers>
 
-#include "TexOffs.h"
-#include "ModelPart.h"
-#include "Cube.h"
 #include "4J.Render/4J_Render.h"
+#include "Cube.h"
+#include "TexOffs.h"
 #include "minecraft/client/MemoryTracker.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Tesselator.h"
diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h
index 808dd3610..02e39f7a5 100644
--- a/targets/minecraft/client/model/geom/ModelPart.h
+++ b/targets/minecraft/client/model/geom/ModelPart.h
@@ -2,11 +2,10 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/client/model/Vertex.h"
-#include "minecraft/client/model/Polygon.h"
+#include "Minecraft.Client/include/SkinBox.h"
 #include "Model.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/client/model/Polygon.h"
+#include "minecraft/client/model/Vertex.h"
 
 class Cube;
 class Model;
diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp
index 8d7a9d338..0eaa2e98c 100644
--- a/targets/minecraft/client/multiplayer/ClientConnection.cpp
+++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp
@@ -1,62 +1,64 @@
-#include "Minecraft.Client/include/stdafx.h"
-#include "console_helpers/PlatformTime.h"
 #include "ClientConnection.h"
+
 #include <cfloat>
 #include <limits>
+
+#include "4J_Input.h"
+#include "DisconnectedScreen.h"
+#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
+#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/src/UI/UI.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "MultiPlayerLevel.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "minecraft/stats/StatsCounter.h"
 #include "ReceivingLevelScreen.h"
-#include "minecraft/client/player/RemotePlayer.h"
-#include "DisconnectedScreen.h"
-#include "minecraft/client/particle/TakeAnimationParticle.h"
-#include "minecraft/client/particle/CritParticle.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/Pos.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/ClientConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/ProgressRenderer.h"
 #include "minecraft/client/User.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/gui/MerchantScreen.h"
+#include "minecraft/client/particle/CritParticle.h"
+#include "minecraft/client/particle/TakeAnimationParticle.h"
+#include "minecraft/client/player/RemotePlayer.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
 #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
+#include "minecraft/world/food/net.minecraft.world.food.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "minecraft/world/food/net.minecraft.world.food.h"
-#include "minecraft/SharedConstants.h"
+#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/Pos.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/client/ClientConstants.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/gui/MerchantScreen.h"
-#include "Minecraft.Client/Common/src/UI/UI.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "minecraft/client/gui/Gui.h"
-#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
-#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "console_helpers/StringHelpers.h"
-#include "4J_Input.h"
 
 ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip,
                                    int port) {
diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h
index f60bf5692..e2fcfc92d 100644
--- a/targets/minecraft/client/multiplayer/ClientConnection.h
+++ b/targets/minecraft/client/multiplayer/ClientConnection.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/network/net.minecraft.network.h"
 #include "4J_Storage.h"
+#include "minecraft/network/net.minecraft.network.h"
 
 class Minecraft;
 class MultiPlayerLevel;
diff --git a/targets/minecraft/client/multiplayer/ConnectScreen.cpp b/targets/minecraft/client/multiplayer/ConnectScreen.cpp
index 27f2a45fa..050e3f6aa 100644
--- a/targets/minecraft/client/multiplayer/ConnectScreen.cpp
+++ b/targets/minecraft/client/multiplayer/ConnectScreen.cpp
@@ -1,15 +1,16 @@
+#include "ConnectScreen.h"
+
 #include <memory>
 #include <vector>
 
-#include "ConnectScreen.h"
 #include "ClientConnection.h"
-#include "minecraft/client/title/TitleScreen.h"
-#include "minecraft/client/gui/Button.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/User.h"
+#include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/title/TitleScreen.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/network/packet/PreLoginPacket.h"
-#include "minecraft/client/gui/Screen.h"
 
 ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::wstring& ip,
                              int port) {
diff --git a/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp b/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp
index 71044f827..b9cd27d2a 100644
--- a/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp
+++ b/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp
@@ -1,11 +1,12 @@
+#include "DisconnectedScreen.h"
+
 #include <vector>
 
-#include "DisconnectedScreen.h"
-#include "minecraft/client/title/TitleScreen.h"
-#include "minecraft/client/gui/Button.h"
-#include "minecraft/locale/Language.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Button.h"
 #include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/title/TitleScreen.h"
+#include "minecraft/locale/Language.h"
 
 DisconnectedScreen::DisconnectedScreen(const std::wstring& title,
                                        const std::wstring reason,
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
index 1c0eebfdb..162840241 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
+++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
@@ -1,22 +1,23 @@
+#include "MultiPlayerChunkCache.h"
+
 #include <stdint.h>
 #include <string.h>
 
-#include "MultiPlayerChunkCache.h"
-#include "minecraft/server/level/ServerChunkCache.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/world/level/chunk/WaterLevelChunk.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerChunkCache.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/LightLayer.h"
 #include "minecraft/world/level/chunk/EmptyLevelChunk.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/chunk/WaterLevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/storage/LevelData.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 MultiPlayerChunkCache::MultiPlayerChunkCache(Level* level) {
     XZSIZE = level->dimension->getXZSize();  // 4J Added
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
index 473ebc001..232170ae2 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h
@@ -3,11 +3,11 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/world/level/levelgen/RandomLevelSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/world/level/levelgen/RandomLevelSource.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 
 class ServerChunkCache;
 class Level;
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp
index e2b444ead..d06dc4fe2 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp
+++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp
@@ -1,12 +1,14 @@
+#include "MultiPlayerGameMode.h"
+
 #include <vector>
 
-#include "MultiPlayerGameMode.h"
-#include "MultiPlayerLocalPlayer.h"
-#include "MultiPlayerLevel.h"
-#include "minecraft/client/Minecraft.h"
 #include "ClientConnection.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
+#include "MultiPlayerLevel.h"
+#include "MultiPlayerLocalPlayer.h"
+#include "java/Class.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/network/packet/ContainerButtonClickPacket.h"
 #include "minecraft/network/packet/ContainerClickPacket.h"
 #include "minecraft/network/packet/CraftItemPacket.h"
@@ -28,7 +30,6 @@
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "java/Class.h"
 
 MultiPlayerGameMode::MultiPlayerGameMode(Minecraft* minecraft,
                                          ClientConnection* connection) {
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h
index dbb9f1861..bd08c3e5b 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <memory>
 
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/server/level/GameMode.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 
 class ClientConnection;
 class GameType;
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp
index d265b6879..5e37f61f3 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp
+++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp
@@ -1,29 +1,34 @@
+#include "MultiPlayerLevel.h"
+
 #include <float.h>
-#include <mutex>
+
 #include <algorithm>
 #include <cmath>
 #include <compare>
+#include <mutex>
 #include <string>
 #include <utility>
 
-#include "MultiPlayerLevel.h"
-#include "MultiPlayerLocalPlayer.h"
-#include "ClientConnection.h"
-#include "MultiPlayerChunkCache.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/particle/FireworksParticles.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "java/JavaMath.h"
 #include "4J.Common/4J_Compat.h"
-#include "4J_Profile.h"
 #include "4J_Input.h"
+#include "4J_Profile.h"
+#include "ClientConnection.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "MultiPlayerChunkCache.h"
+#include "MultiPlayerLocalPlayer.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/FireworksParticles.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/GameRules.h"
@@ -33,11 +38,8 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/storage/MockedLevelStorage.h"
 #include "minecraft/world/level/storage/SavedDataStorage.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Random.h"
-#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 class LevelSettings;
 class Scoreboard;
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
index 31d425956..b5d9749a7 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.h
@@ -1,17 +1,18 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
 #include "console_helpers/HashExtension.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "java/JavaIntHash.h"
 #include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 
 class ClientConnection;
 class MultiPlayerChunkCache;
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp
index 929e1c296..595ebeb3c 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp
+++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp
@@ -1,14 +1,16 @@
+#include "MultiPlayerLocalPlayer.h"
+
 #include <wchar.h>
 
-#include "MultiPlayerLocalPlayer.h"
 #include "ClientConnection.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/player/Input.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/player/Input.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/network/packet/AnimatePacket.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/network/packet/ClientCommandPacket.h"
@@ -21,6 +23,7 @@
 #include "minecraft/network/packet/TextureAndGeometryChangePacket.h"
 #include "minecraft/network/packet/TextureChangePacket.h"
 #include "minecraft/stats/Stat.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/entity/player/Abilities.h"
@@ -28,9 +31,7 @@
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/world/phys/AABB.h"
 
 class User;
 
diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h
index aac78306d..5844857a3 100644
--- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h
+++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/player/Player.h"
 
diff --git a/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp
index b1fadfed4..57927c748 100644
--- a/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp
+++ b/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp
@@ -1,12 +1,13 @@
+#include "ReceivingLevelScreen.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "ReceivingLevelScreen.h"
 #include "ClientConnection.h"
+#include "minecraft/client/gui/Screen.h"
 #include "minecraft/locale/Language.h"
 #include "minecraft/network/packet/KeepAlivePacket.h"
-#include "minecraft/client/gui/Screen.h"
 
 ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection* connection) {
     tickCount = 0;
diff --git a/targets/minecraft/client/particle/BreakingItemParticle.cpp b/targets/minecraft/client/particle/BreakingItemParticle.cpp
index 80363c3a4..d38092799 100644
--- a/targets/minecraft/client/particle/BreakingItemParticle.cpp
+++ b/targets/minecraft/client/particle/BreakingItemParticle.cpp
@@ -1,11 +1,12 @@
 #include "BreakingItemParticle.h"
-#include "minecraft/client/renderer/Tesselator.h"
+
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"
 
 class Level;
 class Textures;
diff --git a/targets/minecraft/client/particle/BubbleParticle.cpp b/targets/minecraft/client/particle/BubbleParticle.cpp
index 8e69ebbd2..7229af4fb 100644
--- a/targets/minecraft/client/particle/BubbleParticle.cpp
+++ b/targets/minecraft/client/particle/BubbleParticle.cpp
@@ -1,10 +1,11 @@
 #include "BubbleParticle.h"
-#include "java/Random.h"
-#include "minecraft/util/Mth.h"
+
 #include "java/JavaMath.h"
+#include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
-#include "minecraft/client/particle/Particle.h"
 
 BubbleParticle::BubbleParticle(Level* level, double x, double y, double z,
                                double xa, double ya, double za)
diff --git a/targets/minecraft/client/particle/CritParticle.cpp b/targets/minecraft/client/particle/CritParticle.cpp
index 45a4f6531..3ed963fd2 100644
--- a/targets/minecraft/client/particle/CritParticle.cpp
+++ b/targets/minecraft/client/particle/CritParticle.cpp
@@ -1,10 +1,11 @@
 #include "CritParticle.h"
+
 #include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"
 
 void CritParticle::_init(Level* level, std::shared_ptr<Entity> entity,
                          ePARTICLE_TYPE type) {
diff --git a/targets/minecraft/client/particle/CritParticle.h b/targets/minecraft/client/particle/CritParticle.h
index 7367f5711..f1f01941d 100644
--- a/targets/minecraft/client/particle/CritParticle.h
+++ b/targets/minecraft/client/particle/CritParticle.h
@@ -3,8 +3,8 @@
 #include <memory>
 
 #include "Particle.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 
 class Entity;
 class Level;
diff --git a/targets/minecraft/client/particle/CritParticle2.cpp b/targets/minecraft/client/particle/CritParticle2.cpp
index 7c4e9945b..c1a5fc264 100644
--- a/targets/minecraft/client/particle/CritParticle2.cpp
+++ b/targets/minecraft/client/particle/CritParticle2.cpp
@@ -1,4 +1,5 @@
 #include "CritParticle2.h"
+
 #include "java/JavaMath.h"
 #include "minecraft/client/particle/Particle.h"
 
diff --git a/targets/minecraft/client/particle/DragonBreathParticle.cpp b/targets/minecraft/client/particle/DragonBreathParticle.cpp
index 22377324f..96196b748 100644
--- a/targets/minecraft/client/particle/DragonBreathParticle.cpp
+++ b/targets/minecraft/client/particle/DragonBreathParticle.cpp
@@ -1,7 +1,8 @@
-#include "java/JavaMath.h"
 #include "DragonBreathParticle.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp
index 10592f3a3..684645f03 100644
--- a/targets/minecraft/client/particle/DripParticle.cpp
+++ b/targets/minecraft/client/particle/DripParticle.cpp
@@ -1,14 +1,15 @@
-#include "java/JavaMath.h"
-#include "minecraft/util/Mth.h"
 #include "DripParticle.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/LiquidTile.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/particle/Particle.h"
 
 DripParticle::DripParticle(Level* level, double x, double y, double z,
                            Material* material)
diff --git a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp
index 27232a578..ca6f203ae 100644
--- a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp
+++ b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp
@@ -1,7 +1,8 @@
-#include "java/JavaMath.h"
 #include "EnchantmentTableParticle.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
diff --git a/targets/minecraft/client/particle/EnderParticle.cpp b/targets/minecraft/client/particle/EnderParticle.cpp
index 8a96d504a..0e7520e3d 100644
--- a/targets/minecraft/client/particle/EnderParticle.cpp
+++ b/targets/minecraft/client/particle/EnderParticle.cpp
@@ -1,8 +1,9 @@
 #include "EnderParticle.h"
-#include "java/JavaMath.h"
-#include "java/Random.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 
diff --git a/targets/minecraft/client/particle/ExplodeParticle.cpp b/targets/minecraft/client/particle/ExplodeParticle.cpp
index 0ae9d870c..d7e729b15 100644
--- a/targets/minecraft/client/particle/ExplodeParticle.cpp
+++ b/targets/minecraft/client/particle/ExplodeParticle.cpp
@@ -1,8 +1,9 @@
 #include "ExplodeParticle.h"
-#include "java/JavaMath.h"
-#include "java/Random.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 
diff --git a/targets/minecraft/client/particle/FireworksParticles.cpp b/targets/minecraft/client/particle/FireworksParticles.cpp
index 16ca0415b..e0194f81a 100644
--- a/targets/minecraft/client/particle/FireworksParticles.cpp
+++ b/targets/minecraft/client/particle/FireworksParticles.cpp
@@ -1,22 +1,24 @@
+#include "FireworksParticles.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <vector>
 
-#include "FireworksParticles.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/item/FireworksItem.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/Tag.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/item/FireworksItem.h"
+#include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/Tag.h"
 
 FireworksParticles::FireworksStarter::FireworksStarter(
     Level* level, double x, double y, double z, double xd, double yd, double zd,
diff --git a/targets/minecraft/client/particle/FireworksParticles.h b/targets/minecraft/client/particle/FireworksParticles.h
index d9770250f..d9de2da0a 100644
--- a/targets/minecraft/client/particle/FireworksParticles.h
+++ b/targets/minecraft/client/particle/FireworksParticles.h
@@ -2,8 +2,8 @@
 #include <format>
 
 #include "Particle.h"
-#include "nbt/CompoundTag.h"
 #include "java/Class.h"
+#include "nbt/CompoundTag.h"
 
 class ParticleEngine;
 class CompoundTag;
diff --git a/targets/minecraft/client/particle/FlameParticle.cpp b/targets/minecraft/client/particle/FlameParticle.cpp
index d7b5b7ed4..5f8a0985e 100644
--- a/targets/minecraft/client/particle/FlameParticle.cpp
+++ b/targets/minecraft/client/particle/FlameParticle.cpp
@@ -1,6 +1,7 @@
+#include "FlameParticle.h"
+
 #include "java/JavaMath.h"
 #include "java/Random.h"
-#include "FlameParticle.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/FootstepParticle.cpp b/targets/minecraft/client/particle/FootstepParticle.cpp
index d746fe49d..1d3537509 100644
--- a/targets/minecraft/client/particle/FootstepParticle.cpp
+++ b/targets/minecraft/client/particle/FootstepParticle.cpp
@@ -1,14 +1,15 @@
+#include "FootstepParticle.h"
+
 #include <GL/gl.h>
 
-#include "FootstepParticle.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/level/Level.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/level/Level.h"
 
 ResourceLocation FootstepParticle::FOOTPRINT_LOCATION =
     ResourceLocation(TN_MISC_FOOTSTEP);
diff --git a/targets/minecraft/client/particle/HeartParticle.cpp b/targets/minecraft/client/particle/HeartParticle.cpp
index 6b35f97b9..6b4203727 100644
--- a/targets/minecraft/client/particle/HeartParticle.cpp
+++ b/targets/minecraft/client/particle/HeartParticle.cpp
@@ -1,4 +1,5 @@
 #include "HeartParticle.h"
+
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp
index 3008c3b28..f4f2d26d8 100644
--- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp
+++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp
@@ -1,17 +1,18 @@
+#include "HugeExplosionParticle.h"
+
 #include <GL/gl.h>
 
-#include "HugeExplosionParticle.h"
-#include "java/Random.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/Random.h"
+#include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 
 class Level;
 
diff --git a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp
index 0ecc334d3..51a8b62f8 100644
--- a/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp
+++ b/targets/minecraft/client/particle/HugeExplosionSeedParticle.cpp
@@ -1,10 +1,11 @@
 #include "HugeExplosionSeedParticle.h"
+
 #include "java/Random.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/world/level/Level.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/level/Level.h"
 
 HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level* level, double x,
                                                      double y, double z,
diff --git a/targets/minecraft/client/particle/LavaParticle.cpp b/targets/minecraft/client/particle/LavaParticle.cpp
index 1a681ba58..69a829634 100644
--- a/targets/minecraft/client/particle/LavaParticle.cpp
+++ b/targets/minecraft/client/particle/LavaParticle.cpp
@@ -1,9 +1,10 @@
 #include "LavaParticle.h"
+
 #include "java/JavaMath.h"
 #include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/client/particle/Particle.h"
 
 LavaParticle::LavaParticle(Level* level, double x, double y, double z)
     : Particle(level, x, y, z, 0, 0, 0) {
diff --git a/targets/minecraft/client/particle/NetherPortalParticle.cpp b/targets/minecraft/client/particle/NetherPortalParticle.cpp
index 48fe63970..85bf330ec 100644
--- a/targets/minecraft/client/particle/NetherPortalParticle.cpp
+++ b/targets/minecraft/client/particle/NetherPortalParticle.cpp
@@ -1,9 +1,10 @@
 #include "NetherPortalParticle.h"
+
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/JavaMath.h"
 #include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/App_enums.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/NoteParticle.cpp b/targets/minecraft/client/particle/NoteParticle.cpp
index 7aba37e37..b5657d288 100644
--- a/targets/minecraft/client/particle/NoteParticle.cpp
+++ b/targets/minecraft/client/particle/NoteParticle.cpp
@@ -1,6 +1,7 @@
+#include "NoteParticle.h"
+
 #include <math.h>
 
-#include "NoteParticle.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/minecraft/client/particle/Particle.cpp b/targets/minecraft/client/particle/Particle.cpp
index f7ec4f4ab..d88f7e684 100644
--- a/targets/minecraft/client/particle/Particle.cpp
+++ b/targets/minecraft/client/particle/Particle.cpp
@@ -1,15 +1,16 @@
+#include "Particle.h"
+
 #include <stdio.h>
 
-#include "Particle.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "java/Random.h"
-#include "minecraft/util/Mth.h"
-#include "java/JavaMath.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/world/Icon.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/Icon.h"
 
 class Level;
 class Textures;
diff --git a/targets/minecraft/client/particle/Particle.h b/targets/minecraft/client/particle/Particle.h
index 39a34696f..5853c517a 100644
--- a/targets/minecraft/client/particle/Particle.h
+++ b/targets/minecraft/client/particle/Particle.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "ParticleEngine.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/entity/Entity.h"
 
 class Tesselator;
 class CompoundTag;
diff --git a/targets/minecraft/client/particle/ParticleEngine.cpp b/targets/minecraft/client/particle/ParticleEngine.cpp
index 05f096d47..89345eab0 100644
--- a/targets/minecraft/client/particle/ParticleEngine.cpp
+++ b/targets/minecraft/client/particle/ParticleEngine.cpp
@@ -1,25 +1,27 @@
+#include "ParticleEngine.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <algorithm>
 #include <numbers>
 
-#include "ParticleEngine.h"
+#include "4J.Render/4J_Render.h"
 #include "Particle.h"
+#include "TerrainParticle.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Class.h"
+#include "java/Random.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/Camera.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "TerrainParticle.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/client/Camera.h"
-#include "console_helpers/StringHelpers.h"
-#include "4J.Render/4J_Render.h"
-#include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "java/Class.h"
-#include "java/Random.h"
 
 ResourceLocation ParticleEngine::PARTICLES_LOCATION =
     ResourceLocation(TN_PARTICLES);
diff --git a/targets/minecraft/client/particle/PlayerCloudParticle.cpp b/targets/minecraft/client/particle/PlayerCloudParticle.cpp
index 04d3686cc..073df01a4 100644
--- a/targets/minecraft/client/particle/PlayerCloudParticle.cpp
+++ b/targets/minecraft/client/particle/PlayerCloudParticle.cpp
@@ -1,11 +1,12 @@
+#include "PlayerCloudParticle.h"
+
 #include <memory>
 
-#include "PlayerCloudParticle.h"
 #include "java/JavaMath.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/client/particle/Particle.h"
 
 PlayerCloudParticle::PlayerCloudParticle(Level* level, double x, double y,
                                          double z, double xa, double ya,
diff --git a/targets/minecraft/client/particle/RedDustParticle.cpp b/targets/minecraft/client/particle/RedDustParticle.cpp
index 449bf5e3f..95d6b75ac 100644
--- a/targets/minecraft/client/particle/RedDustParticle.cpp
+++ b/targets/minecraft/client/particle/RedDustParticle.cpp
@@ -1,5 +1,6 @@
-#include "java/JavaMath.h"
 #include "RedDustParticle.h"
+
+#include "java/JavaMath.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/SmokeParticle.cpp b/targets/minecraft/client/particle/SmokeParticle.cpp
index c3a15ce17..5239aaed0 100644
--- a/targets/minecraft/client/particle/SmokeParticle.cpp
+++ b/targets/minecraft/client/particle/SmokeParticle.cpp
@@ -1,7 +1,8 @@
-#include "java/JavaMath.h"
 #include "SmokeParticle.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaMath.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
 
diff --git a/targets/minecraft/client/particle/SnowShovelParticle.cpp b/targets/minecraft/client/particle/SnowShovelParticle.cpp
index b7d266afe..8d7a3038a 100644
--- a/targets/minecraft/client/particle/SnowShovelParticle.cpp
+++ b/targets/minecraft/client/particle/SnowShovelParticle.cpp
@@ -1,5 +1,6 @@
-#include "java/JavaMath.h"
 #include "SnowShovelParticle.h"
+
+#include "java/JavaMath.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/SpellParticle.cpp b/targets/minecraft/client/particle/SpellParticle.cpp
index ee01dcd5a..6102e2520 100644
--- a/targets/minecraft/client/particle/SpellParticle.cpp
+++ b/targets/minecraft/client/particle/SpellParticle.cpp
@@ -1,5 +1,6 @@
-#include "java/JavaMath.h"
 #include "SpellParticle.h"
+
+#include "java/JavaMath.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/SplashParticle.cpp b/targets/minecraft/client/particle/SplashParticle.cpp
index 06904f7be..195dd1ab5 100644
--- a/targets/minecraft/client/particle/SplashParticle.cpp
+++ b/targets/minecraft/client/particle/SplashParticle.cpp
@@ -1,4 +1,5 @@
 #include "SplashParticle.h"
+
 #include "minecraft/client/particle/WaterDropParticle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp
index 7be5a02e6..d28c4ae29 100644
--- a/targets/minecraft/client/particle/SuspendedParticle.cpp
+++ b/targets/minecraft/client/particle/SuspendedParticle.cpp
@@ -1,13 +1,14 @@
 #include "SuspendedParticle.h"
-#include "java/Random.h"
-#include "java/JavaMath.h"
-#include "minecraft/util/Mth.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/material/Material.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/particle/Particle.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/material/Material.h"
 
 SuspendedParticle::SuspendedParticle(Level* level, double x, double y, double z,
                                      double xa, double ya, double za)
diff --git a/targets/minecraft/client/particle/SuspendedTownParticle.cpp b/targets/minecraft/client/particle/SuspendedTownParticle.cpp
index 2f84ad9f4..e342dc03c 100644
--- a/targets/minecraft/client/particle/SuspendedTownParticle.cpp
+++ b/targets/minecraft/client/particle/SuspendedTownParticle.cpp
@@ -1,6 +1,7 @@
 #include "SuspendedTownParticle.h"
-#include "java/Random.h"
+
 #include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/client/particle/Particle.h"
 
 class Level;
diff --git a/targets/minecraft/client/particle/TakeAnimationParticle.cpp b/targets/minecraft/client/particle/TakeAnimationParticle.cpp
index 06918ac66..dfc59c6ab 100644
--- a/targets/minecraft/client/particle/TakeAnimationParticle.cpp
+++ b/targets/minecraft/client/particle/TakeAnimationParticle.cpp
@@ -1,14 +1,15 @@
+#include "TakeAnimationParticle.h"
+
 #include <GL/gl.h>
 
-#include "TakeAnimationParticle.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/util/Mth.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/level/Level.h"
 #include "minecraft/client/particle/Particle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/level/Level.h"
 
 TakeAnimationParticle::TakeAnimationParticle(Level* level,
                                              std::shared_ptr<Entity> item,
diff --git a/targets/minecraft/client/particle/TerrainParticle.cpp b/targets/minecraft/client/particle/TerrainParticle.cpp
index 0abb2055e..922788805 100644
--- a/targets/minecraft/client/particle/TerrainParticle.cpp
+++ b/targets/minecraft/client/particle/TerrainParticle.cpp
@@ -1,12 +1,13 @@
 #include "TerrainParticle.h"
-#include "minecraft/client/renderer/Tesselator.h"
+
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/GrassTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"
 
 class Textures;
 
diff --git a/targets/minecraft/client/particle/WaterDropParticle.cpp b/targets/minecraft/client/particle/WaterDropParticle.cpp
index 7dcbcabd6..5dbf7cdd1 100644
--- a/targets/minecraft/client/particle/WaterDropParticle.cpp
+++ b/targets/minecraft/client/particle/WaterDropParticle.cpp
@@ -1,11 +1,12 @@
 #include "WaterDropParticle.h"
+
 #include "java/JavaMath.h"
+#include "java/Random.h"
+#include "minecraft/client/particle/Particle.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/LiquidTile.h"
-#include "java/Random.h"
-#include "minecraft/client/particle/Particle.h"
 
 WaterDropParticle::WaterDropParticle(Level* level, double x, double y, double z)
     : Particle(level, x, y, z, 0, 0, 0) {
diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp
index 5ba9a83c1..af2147d5f 100644
--- a/targets/minecraft/client/player/Input.cpp
+++ b/targets/minecraft/client/player/Input.cpp
@@ -1,14 +1,15 @@
+#include "Input.h"
+
 #include <cmath>
 
-#include "minecraft/client/Minecraft.h"
-#include "Input.h"
-#include "LocalPlayer.h"
-#include "4J_Input.h"
 #include "4J.Common/4J_InputActions.h"
+#include "4J_Input.h"
+#include "LocalPlayer.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/entity/player/Abilities.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/world/entity/player/Abilities.h"
 
 Input::Input() {
     xa = 0;
diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp
index 49c33bffb..c8d8093df 100644
--- a/targets/minecraft/client/player/LocalPlayer.cpp
+++ b/targets/minecraft/client/player/LocalPlayer.cpp
@@ -1,35 +1,34 @@
+#include "LocalPlayer.h"
+
 #include <math.h>
 #include <stdio.h>
+
 #include <iostream>
 #include <memory>
 #include <numbers>
 
-#include "LocalPlayer.h"
-#include "minecraft/client/User.h"
 #include "Input.h"
-#include "minecraft/stats/StatsCounter.h"
+#include "java/Random.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/User.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/CritParticle.h"
 #include "minecraft/client/particle/ParticleEngine.h"
 #include "minecraft/client/particle/TakeAnimationParticle.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/GameRenderer.h"
 #include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/stats/StatsCounter.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/level/storage/LevelData.h"
-#include "java/Random.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/particle/CritParticle.h"
 // 4J : WESTY : Added for new achievements.
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
 // 4J Stu - Added for tutorial callbacks
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/stats/CommonStats.h"
+#include "4J.Render/4J_Render.h"
 #include "4J_Input.h"
 #include "4J_Profile.h"
-#include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
@@ -40,10 +39,14 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/SharedConstants.h"
 #include "minecraft/stats/Achievement.h"
+#include "minecraft/stats/CommonStats.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/stats/Stat.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -58,13 +61,12 @@
 #include "minecraft/world/item/BowItem.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/tile/entity/CommandBlockEntity.h"
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user,
                          int dimension)
diff --git a/targets/minecraft/client/player/LocalPlayer.h b/targets/minecraft/client/player/LocalPlayer.h
index 403d1247e..48445f947 100644
--- a/targets/minecraft/client/player/LocalPlayer.h
+++ b/targets/minecraft/client/player/LocalPlayer.h
@@ -4,12 +4,12 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/util/SmoothFloat.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "java/Class.h"
 #include "minecraft/Pos.h"
 #include "minecraft/commands/CommandsEnum.h"
+#include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "java/Class.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 
 class Level;
 class User;
diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp
index b32389088..c5b5e208e 100644
--- a/targets/minecraft/client/player/RemotePlayer.cpp
+++ b/targets/minecraft/client/player/RemotePlayer.cpp
@@ -1,10 +1,12 @@
+#include "RemotePlayer.h"
+
 #include <math.h>
+
 #include <memory>
 #include <vector>
 
-#include "RemotePlayer.h"
-#include "minecraft/util/Mth.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/client/player/RemotePlayer.h b/targets/minecraft/client/player/RemotePlayer.h
index e9bab437d..ebdf2745f 100644
--- a/targets/minecraft/client/player/RemotePlayer.h
+++ b/targets/minecraft/client/player/RemotePlayer.h
@@ -1,12 +1,12 @@
 #pragma once
 #include <string>
 
-#include "minecraft/util/SmoothFloat.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "java/Class.h"
 #include "minecraft/Pos.h"
 #include "minecraft/commands/CommandsEnum.h"
+#include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/entity/player/Player.h"
-#include "java/Class.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 
 class Input;
 class Level;
diff --git a/targets/minecraft/client/renderer/BossMobGuiInfo.cpp b/targets/minecraft/client/renderer/BossMobGuiInfo.cpp
index a6d0dec38..3001120c5 100644
--- a/targets/minecraft/client/renderer/BossMobGuiInfo.cpp
+++ b/targets/minecraft/client/renderer/BossMobGuiInfo.cpp
@@ -1,6 +1,7 @@
 #include "BossMobGuiInfo.h"
-#include "minecraft/world/entity/boss/BossMob.h"
+
 #include "minecraft/SharedConstants.h"
+#include "minecraft/world/entity/boss/BossMob.h"
 
 float BossMobGuiInfo::healthProgress = 0.0f;
 int BossMobGuiInfo::displayTicks = 0;
diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp
index 41162f1a7..2cba370ee 100644
--- a/targets/minecraft/client/renderer/Chunk.cpp
+++ b/targets/minecraft/client/renderer/Chunk.cpp
@@ -1,18 +1,25 @@
+#include "Chunk.h"
+
 #include <GL/gl.h>
 #include <string.h>
-#include <unordered_set>
+
 #include <mutex>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
-#include "Chunk.h"
-#include "TileRenderer.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "LevelRenderer.h"
-#include "Minecraft.Client/include/FrameProfiler.h"
 #include "4J.Render/4J_Render.h"
+#include "LevelRenderer.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/FrameProfiler.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "TileRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/culling/Culler.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
@@ -20,11 +27,6 @@
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/culling/Culler.h"
 
 int Chunk::updates = 0;
 
diff --git a/targets/minecraft/client/renderer/Chunk.h b/targets/minecraft/client/renderer/Chunk.h
index a4f63ed88..1c4e82c9a 100644
--- a/targets/minecraft/client/renderer/Chunk.h
+++ b/targets/minecraft/client/renderer/Chunk.h
@@ -1,12 +1,13 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <mutex>
 
-#include "minecraft/client/renderer/culling/AllowAllCuller.h"
-#include "Tesselator.h"
 #include "LevelRenderer.h"
+#include "Tesselator.h"
+#include "minecraft/client/renderer/culling/AllowAllCuller.h"
 #include "minecraft/world/phys/AABB.h"
 
 class Level;
diff --git a/targets/minecraft/client/renderer/DirtyChunkSorter.cpp b/targets/minecraft/client/renderer/DirtyChunkSorter.cpp
index bb765f109..86e7ccea8 100644
--- a/targets/minecraft/client/renderer/DirtyChunkSorter.cpp
+++ b/targets/minecraft/client/renderer/DirtyChunkSorter.cpp
@@ -1,4 +1,5 @@
 #include "DirtyChunkSorter.h"
+
 #include "Chunk.h"
 #include "minecraft/world/entity/LivingEntity.h"
 
diff --git a/targets/minecraft/client/renderer/DistanceChunkSorter.cpp b/targets/minecraft/client/renderer/DistanceChunkSorter.cpp
index cc14823b1..158ece9f1 100644
--- a/targets/minecraft/client/renderer/DistanceChunkSorter.cpp
+++ b/targets/minecraft/client/renderer/DistanceChunkSorter.cpp
@@ -1,4 +1,5 @@
 #include "DistanceChunkSorter.h"
+
 #include "Chunk.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/client/renderer/EntityTileRenderer.cpp b/targets/minecraft/client/renderer/EntityTileRenderer.cpp
index ea378edb5..91ee5c7c4 100644
--- a/targets/minecraft/client/renderer/EntityTileRenderer.cpp
+++ b/targets/minecraft/client/renderer/EntityTileRenderer.cpp
@@ -1,4 +1,5 @@
 #include "EntityTileRenderer.h"
+
 #include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
 #include "minecraft/world/level/tile/ChestTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp
index 4a6b2e584..0a075b64e 100644
--- a/targets/minecraft/client/renderer/GameRenderer.cpp
+++ b/targets/minecraft/client/renderer/GameRenderer.cpp
@@ -1,89 +1,91 @@
+#include "GameRenderer.h"
+
 #include <GL/gl.h>
 #include <float.h>
+
 #include <algorithm>
 #include <cmath>
 #include <numbers>
 
-#include "GameRenderer.h"
-#include "ItemInHandRenderer.h"
-#include "LevelRenderer.h"
-#include "minecraft/client/renderer/culling/Frustum.h"
-#include "minecraft/client/renderer/culling/FrustumCuller.h"
-#include "Textures.h"
-#include "Tesselator.h"
-#include "minecraft/client/particle/ParticleEngine.h"
-#include "minecraft/client/particle/SmokeParticle.h"
-#include "minecraft/client/particle/WaterDropParticle.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/gui/particle/GuiParticles.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Chunk.h"
-#include "java/System.h"
-#include "java/FloatBuffer.h"
-#include "minecraft/world/level/chunk/SparseLightStorage.h"
-#include "minecraft/world/level/chunk/CompressedTileStorage.h"
-#include "minecraft/world/level/chunk/SparseDataStorage.h"
-#include "java/JavaMath.h"
-#include "minecraft/Facing.h"
-#include "minecraft/world/effect/MobEffect.h"
-#include "minecraft/util/SmoothFloat.h"
-#include "minecraft/world/effect/MobEffectInstance.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/client/Camera.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "console_helpers/compression.h"
-#include "Minecraft.Client/Common/ShutdownManager.h"
-#include "BossMobGuiInfo.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "Minecraft.Client/include/FrameProfiler.h"
 #include "4J.Common/4J_Compat.h"
+#include "4J.Render/4J_Render.h"
 #include "4J_Input.h"
 #include "4J_Profile.h"
-#include "4J.Render/4J_Render.h"
-#include "Minecraft.Client/include/BufferedImage.h"
+#include "BossMobGuiInfo.h"
+#include "Chunk.h"
+#include "ItemInHandRenderer.h"
+#include "LevelRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/ShutdownManager.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "Minecraft.Client/include/FrameProfiler.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "Tesselator.h"
+#include "Textures.h"
+#include "console_helpers/compression.h"
+#include "java/Class.h"
+#include "java/FloatBuffer.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
+#include "java/System.h"
+#include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Camera.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/gui/Screen.h"
+#include "minecraft/client/gui/ScreenSizeCalculator.h"
+#include "minecraft/client/gui/particle/GuiParticles.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/particle/SmokeParticle.h"
+#include "minecraft/client/particle/WaterDropParticle.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/culling/Culler.h"
+#include "minecraft/client/renderer/culling/Frustum.h"
+#include "minecraft/client/renderer/culling/FrustumCuller.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/util/SmoothFloat.h"
+#include "minecraft/world/effect/MobEffect.h"
+#include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/enchantment/EnchantmentHelper.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/biome/BiomeSource.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/CompressedTileStorage.h"
+#include "minecraft/world/level/chunk/SparseDataStorage.h"
+#include "minecraft/world/level/chunk/SparseLightStorage.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Class.h"
-#include "java/Random.h"
-#include "minecraft/client/MemoryTracker.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/gui/Screen.h"
-#include "minecraft/client/gui/ScreenSizeCalculator.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/client/renderer/culling/Culler.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "Minecraft.Client/include/stubs.h"
 
 bool GameRenderer::anaglyph3d = false;
 int GameRenderer::anaglyphPass = 0;
diff --git a/targets/minecraft/client/renderer/GameRenderer.h b/targets/minecraft/client/renderer/GameRenderer.h
index 499083dcb..4d73dd2ba 100644
--- a/targets/minecraft/client/renderer/GameRenderer.h
+++ b/targets/minecraft/client/renderer/GameRenderer.h
@@ -1,14 +1,15 @@
 #pragma once
 #include <stdint.h>
-#include <mutex>
+
 #include <format>
 #include <memory>
+#include <mutex>
 #include <vector>
 
-#include "minecraft/util/SmoothFloat.h"
+#include "Minecraft.Client/Common/App_Defines.h"
 #include "console_helpers/C4JThread.h"
 #include "minecraft/client/resources/ResourceLocation.h"
-#include "Minecraft.Client/Common/App_Defines.h"
+#include "minecraft/util/SmoothFloat.h"
 #include "minecraft/world/phys/Vec3.h"
 
 class Minecraft;
diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp
index d050e7c1a..49acc4162 100644
--- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp
+++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp
@@ -1,25 +1,35 @@
+#include "ItemInHandRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <numbers>
 #include <vector>
 
-#include "ItemInHandRenderer.h"
-#include "TileRenderer.h"
-#include "Tesselator.h"
-#include "Textures.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/entity/PlayerRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/gui/Minimap.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "Tesselator.h"
+#include "Textures.h"
+#include "TileRenderer.h"
+#include "java/System.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Minimap.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/entity/PlayerRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -33,14 +43,6 @@
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/FireTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/System.h"
-#include "minecraft/client/MemoryTracker.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 class EntityRenderer;
 class MapItemSavedData;
diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp
index 22b5f5fb1..6c6bf8eb9 100644
--- a/targets/minecraft/client/renderer/LevelRenderer.cpp
+++ b/targets/minecraft/client/renderer/LevelRenderer.cpp
@@ -1,69 +1,87 @@
+#include "LevelRenderer.h"
+
 #include <GL/gl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include <array>
-#include <mutex>
-#include <cmath>
+
 #include <algorithm>
+#include <array>
+#include <cmath>
+#include <mutex>
 #include <numbers>
 #include <ranges>
 #include <utility>
 
-#include "LevelRenderer.h"
-#include "Textures.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "Tesselator.h"
-#include "Chunk.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
-#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
-#include "GameRenderer.h"
-#include "minecraft/client/particle/BubbleParticle.h"
-#include "minecraft/client/particle/SmokeParticle.h"
-#include "minecraft/client/particle/NoteParticle.h"
-#include "minecraft/client/particle/NetherPortalParticle.h"
-#include "minecraft/client/particle/EnderParticle.h"
-#include "minecraft/client/particle/ExplodeParticle.h"
-#include "minecraft/client/particle/FlameParticle.h"
-#include "minecraft/client/particle/LavaParticle.h"
-#include "minecraft/client/particle/FootstepParticle.h"
-#include "minecraft/client/particle/SplashParticle.h"
-#include "minecraft/client/particle/RedDustParticle.h"
-#include "minecraft/client/particle/BreakingItemParticle.h"
-#include "minecraft/client/particle/SnowShovelParticle.h"
-#include "minecraft/client/particle/HeartParticle.h"
-#include "minecraft/client/particle/HugeExplosionParticle.h"
-#include "minecraft/client/particle/HugeExplosionSeedParticle.h"
-#include "minecraft/client/particle/SuspendedParticle.h"
-#include "minecraft/client/particle/SuspendedTownParticle.h"
-#include "minecraft/client/particle/CritParticle2.h"
-#include "minecraft/client/particle/TerrainParticle.h"
-#include "minecraft/client/particle/SpellParticle.h"
-#include "minecraft/client/particle/DripParticle.h"
-#include "minecraft/client/particle/EnchantmentTableParticle.h"
-#include "minecraft/client/particle/DragonBreathParticle.h"
-#include "minecraft/client/particle/FireworksParticles.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "java/JavaMath.h"
-#include "java/System.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/sounds/SoundTypes.h"
-#include "minecraft/client/renderer/culling/FrustumCuller.h"
-#include "Minecraft.Client/include/FrameProfiler.h"
 #include "4J.Common/4J_Compat.h"
-#include "4J_Profile.h"
 #include "4J.Render/4J_Render.h"
+#include "4J_Input.h"
+#include "4J_Profile.h"
+#include "Chunk.h"
+#include "GameRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/FrameProfiler.h"
+#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
+#include "Minecraft.Client/include/stubs.h"
+#include "Tesselator.h"
+#include "Textures.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Class.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
+#include "java/System.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Lighting.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/particle/BreakingItemParticle.h"
+#include "minecraft/client/particle/BubbleParticle.h"
+#include "minecraft/client/particle/CritParticle2.h"
+#include "minecraft/client/particle/DragonBreathParticle.h"
+#include "minecraft/client/particle/DripParticle.h"
+#include "minecraft/client/particle/EnchantmentTableParticle.h"
+#include "minecraft/client/particle/EnderParticle.h"
+#include "minecraft/client/particle/ExplodeParticle.h"
+#include "minecraft/client/particle/FireworksParticles.h"
+#include "minecraft/client/particle/FlameParticle.h"
+#include "minecraft/client/particle/FootstepParticle.h"
+#include "minecraft/client/particle/HeartParticle.h"
+#include "minecraft/client/particle/HugeExplosionParticle.h"
+#include "minecraft/client/particle/HugeExplosionSeedParticle.h"
+#include "minecraft/client/particle/LavaParticle.h"
+#include "minecraft/client/particle/NetherPortalParticle.h"
+#include "minecraft/client/particle/NoteParticle.h"
+#include "minecraft/client/particle/Particle.h"
+#include "minecraft/client/particle/ParticleEngine.h"
+#include "minecraft/client/particle/RedDustParticle.h"
+#include "minecraft/client/particle/SmokeParticle.h"
+#include "minecraft/client/particle/SnowShovelParticle.h"
+#include "minecraft/client/particle/SpellParticle.h"
+#include "minecraft/client/particle/SplashParticle.h"
+#include "minecraft/client/particle/SuspendedParticle.h"
+#include "minecraft/client/particle/SuspendedTownParticle.h"
+#include "minecraft/client/particle/TerrainParticle.h"
+#include "minecraft/client/player/LocalPlayer.h"
+#include "minecraft/client/renderer/OffsettedRenderList.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/culling/Culler.h"
+#include "minecraft/client/renderer/culling/Frustum.h"
+#include "minecraft/client/renderer/culling/FrustumCuller.h"
+#include "minecraft/client/renderer/culling/FrustumData.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/Entity.h"
@@ -88,23 +106,6 @@
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "java/Class.h"
-#include "java/Random.h"
-#include "minecraft/client/MemoryTracker.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/particle/Particle.h"
-#include "minecraft/client/particle/ParticleEngine.h"
-#include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/client/renderer/OffsettedRenderList.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/culling/Culler.h"
-#include "minecraft/client/renderer/culling/Frustum.h"
-#include "minecraft/client/renderer/culling/FrustumData.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "Minecraft.Client/include/stubs.h"
-#include "4J_Input.h"
-#include "minecraft/util/Mth.h"
 
 class Icon;
 class ItemInstance;
diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h
index 1e8cf0f05..9265bed75 100644
--- a/targets/minecraft/client/renderer/LevelRenderer.h
+++ b/targets/minecraft/client/renderer/LevelRenderer.h
@@ -1,15 +1,15 @@
 #pragma once
-#include "minecraft/world/level/LevelListener.h"
-#include "console_helpers/Definitions.h"
-#include "OffsettedRenderList.h"
-#include "java/JavaIntHash.h"
-#include "minecraft/world/level/Level.h"
-#include "console_helpers/C4JThread.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "OffsettedRenderList.h"
+#include "console_helpers/C4JThread.h"
+#include "console_helpers/Definitions.h"
+#include "java/JavaIntHash.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/LevelListener.h"
+#include "minecraft/world/phys/AABB.h"
 
 class ClipChunk;
 class HitResult;
@@ -23,12 +23,13 @@ class ResourceLocation;
 #endif
 #include <stddef.h>
 #include <stdint.h>
-#include <unordered_set>
-#include <mutex>
+
 #include <format>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 class MultiPlayerLevel;
diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp
index e0cc2d563..a3ee6061e 100644
--- a/targets/minecraft/client/renderer/MemTexture.cpp
+++ b/targets/minecraft/client/renderer/MemTexture.cpp
@@ -1,7 +1,8 @@
+#include "Minecraft.Client/include/MemTexture.h"
+
 #include <cstdint>
 #include <string>
 
-#include "Minecraft.Client/include/MemTexture.h"
 #include "Minecraft.Client/include/BufferedImage.h"
 
 class MemTextureProcessor;
diff --git a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
index d49f919b6..64a648043 100644
--- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
@@ -1,4 +1,5 @@
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
+
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/include/stubs.h"
 
diff --git a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
index edef37c64..db2999f81 100644
--- a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
@@ -1,4 +1,5 @@
 #include "MobSkinTextureProcessor.h"
+
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/include/stubs.h"
 
diff --git a/targets/minecraft/client/renderer/OffsettedRenderList.cpp b/targets/minecraft/client/renderer/OffsettedRenderList.cpp
index eec780812..b6becc340 100644
--- a/targets/minecraft/client/renderer/OffsettedRenderList.cpp
+++ b/targets/minecraft/client/renderer/OffsettedRenderList.cpp
@@ -1,6 +1,7 @@
-#include "java/IntBuffer.h"
 #include "OffsettedRenderList.h"
+
 #include "4J.Render/4J_Render.h"
+#include "java/IntBuffer.h"
 #include "minecraft/client/MemoryTracker.h"
 
 // 4J added
diff --git a/targets/minecraft/client/renderer/Rect2i.cpp b/targets/minecraft/client/renderer/Rect2i.cpp
index d9a6f51fd..0cb246af2 100644
--- a/targets/minecraft/client/renderer/Rect2i.cpp
+++ b/targets/minecraft/client/renderer/Rect2i.cpp
@@ -1,7 +1,7 @@
-#include <algorithm>
-
 #include "Rect2i.h"
 
+#include <algorithm>
+
 Rect2i::Rect2i(int x, int y, int width, int height) {
     xPos = x;
     yPos = y;
diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp
index f7ad41411..22c37af28 100644
--- a/targets/minecraft/client/renderer/Tesselator.cpp
+++ b/targets/minecraft/client/renderer/Tesselator.cpp
@@ -1,12 +1,14 @@
+#include "Tesselator.h"
+
 #include <GL/gl.h>
+
 #include <vector>
 
-#include "Tesselator.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/client/MemoryTracker.h"
 #include "Minecraft.Client/include/stubs.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/renderer/Tesselator.h"
 
 bool Tesselator::TRIANGLE_MODE = false;
 bool Tesselator::USE_VBO = false;
diff --git a/targets/minecraft/client/renderer/Tesselator.h b/targets/minecraft/client/renderer/Tesselator.h
index 465fb1707..e419a1599 100644
--- a/targets/minecraft/client/renderer/Tesselator.h
+++ b/targets/minecraft/client/renderer/Tesselator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <float.h>
+
 #include <cstdint>
 #include <format>
 #include <vector>
diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp
index e26e274bc..4cfb1f072 100644
--- a/targets/minecraft/client/renderer/Textures.cpp
+++ b/targets/minecraft/client/renderer/Textures.cpp
@@ -1,33 +1,35 @@
+#include "Textures.h"
+
 #include <GL/gl.h>
 #include <assert.h>
-#include <string>
-#include <cstring>
+
 #include <cstdint>
+#include <cstring>
+#include <string>
 #include <utility>
 
-#include "Textures.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
 #include "HttpTexture.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/include/MemTexture.h"
-#include "java/ByteBuffer.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/Options.h"
 #include "Minecraft.Client/include/MemTextureProcessor.h"
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Buffer.h"
+#include "java/ByteBuffer.h"
+#include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/texture/PreStitchedTextureMap.h"
 #include "minecraft/client/renderer/texture/Texture.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "Minecraft.Client/include/BufferedImage.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "java/Buffer.h"
-#include "minecraft/client/MemoryTracker.h"
 
 // Linux/PC port: disable mipmapping globally so textures are always sampled
 // from the full-resolution level 0 with GL_NEAREST, giving pixel-crisp
diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp
index 6e93e9b74..2d6670f65 100644
--- a/targets/minecraft/client/renderer/TileRenderer.cpp
+++ b/targets/minecraft/client/renderer/TileRenderer.cpp
@@ -1,24 +1,29 @@
+#include "TileRenderer.h"
+
 #include <GL/gl.h>
 #include <assert.h>
 #include <stdint.h>
+
 #include <array>
 #include <cmath>
 #include <numbers>
 
-#include "TileRenderer.h"
-#include "GameRenderer.h"
-#include "minecraft/client/Minecraft.h"
-#include "Textures.h"
-#include "Tesselator.h"
-#include "Minecraft.Client/include/FrameProfiler.h"
-#include "EntityTileRenderer.h"
-#include "minecraft/client/renderer/TileRenderer.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityTileRenderer.h"
+#include "GameRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/include/FrameProfiler.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "Tesselator.h"
+#include "Textures.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/TileRenderer.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
@@ -63,9 +68,6 @@
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
 #include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 bool TileRenderer::fancy = true;
 
diff --git a/targets/minecraft/client/renderer/culling/Frustum.cpp b/targets/minecraft/client/renderer/culling/Frustum.cpp
index 426af69cf..5509cc645 100644
--- a/targets/minecraft/client/renderer/culling/Frustum.cpp
+++ b/targets/minecraft/client/renderer/culling/Frustum.cpp
@@ -1,11 +1,13 @@
+#include "Frustum.h"
+
 #include <GL/gl.h>
 #include <string.h>
+
 #include <cmath>
 #include <vector>
 
-#include "java/FloatBuffer.h"
-#include "Frustum.h"
 #include "4J.Render/4J_Render.h"
+#include "java/FloatBuffer.h"
 #include "minecraft/client/MemoryTracker.h"
 
 class FrustumData;
diff --git a/targets/minecraft/client/renderer/culling/FrustumCuller.cpp b/targets/minecraft/client/renderer/culling/FrustumCuller.cpp
index 4f387548c..60b8a3d42 100644
--- a/targets/minecraft/client/renderer/culling/FrustumCuller.cpp
+++ b/targets/minecraft/client/renderer/culling/FrustumCuller.cpp
@@ -1,7 +1,8 @@
 #include "FrustumCuller.h"
-#include "minecraft/world/phys/AABB.h"
+
 #include "minecraft/client/renderer/culling/Frustum.h"
 #include "minecraft/client/renderer/culling/FrustumData.h"
+#include "minecraft/world/phys/AABB.h"
 
 FrustumCuller::FrustumCuller() { frustum = Frustum::getFrustum(); }
 
diff --git a/targets/minecraft/client/renderer/culling/FrustumData.cpp b/targets/minecraft/client/renderer/culling/FrustumData.cpp
index 11815c513..d97c9b6b1 100644
--- a/targets/minecraft/client/renderer/culling/FrustumData.cpp
+++ b/targets/minecraft/client/renderer/culling/FrustumData.cpp
@@ -1,4 +1,5 @@
 #include "FrustumData.h"
+
 #include "minecraft/world/phys/AABB.h"
 
 // float** m_Frustum;
diff --git a/targets/minecraft/client/renderer/culling/ViewportCuller.cpp b/targets/minecraft/client/renderer/culling/ViewportCuller.cpp
index ac2b64266..750a7de33 100644
--- a/targets/minecraft/client/renderer/culling/ViewportCuller.cpp
+++ b/targets/minecraft/client/renderer/culling/ViewportCuller.cpp
@@ -1,7 +1,9 @@
+#include "ViewportCuller.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "ViewportCuller.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/phys/AABB.h"
 
diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp
index 2b1b14e51..001d7065b 100644
--- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp
@@ -1,14 +1,16 @@
+#include "ArrowRenderer.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <memory>
 
-#include "ArrowRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/projectile/Arrow.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/projectile/Arrow.h"
 
 ResourceLocation ArrowRenderer::ARROW_LOCATION =
     ResourceLocation(TN_ITEM_ARROWS);
diff --git a/targets/minecraft/client/renderer/entity/BatRenderer.cpp b/targets/minecraft/client/renderer/entity/BatRenderer.cpp
index 550f677fa..8230d8104 100644
--- a/targets/minecraft/client/renderer/entity/BatRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/BatRenderer.cpp
@@ -1,15 +1,16 @@
+#include "BatRenderer.h"
+
 #include <cmath>
 #include <memory>
 
-#include "BatRenderer.h"
-#include "minecraft/client/model/BatModel.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/ambient/Bat.h"
+#include "minecraft/client/model/BatModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/ambient/Bat.h"
 
 ResourceLocation BatRenderer::BAT_LOCATION = ResourceLocation(TN_MOB_BAT);
 
diff --git a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp
index f5a9ca370..7fc9b7af3 100644
--- a/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/BlazeRenderer.cpp
@@ -1,12 +1,13 @@
+#include "BlazeRenderer.h"
+
 #include <memory>
 
 #include "minecraft/client/model/BlazeModel.h"
-#include "BlazeRenderer.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/monster/Blaze.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/monster/Blaze.h"
 
 ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);
 
diff --git a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp
index c057a0058..75c715905 100644
--- a/targets/minecraft/client/renderer/entity/BoatRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/BoatRenderer.cpp
@@ -1,15 +1,17 @@
+#include "BoatRenderer.h"
+
 #include <math.h>
+
 #include <memory>
 
-#include "BoatRenderer.h"
-#include "minecraft/client/model/BoatModel.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/item/Boat.h"
+#include "minecraft/client/model/BoatModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/EntityRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/item/Boat.h"
 
 ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);
 
diff --git a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp
index f60073971..f2137e6f1 100644
--- a/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/CaveSpiderRenderer.cpp
@@ -1,6 +1,7 @@
+#include "CaveSpiderRenderer.h"
+
 #include <memory>
 
-#include "CaveSpiderRenderer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/SpiderRenderer.h"
diff --git a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp
index 356a8e6a4..b22ba411f 100644
--- a/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ChickenRenderer.cpp
@@ -1,12 +1,14 @@
+#include "ChickenRenderer.h"
+
 #include <math.h>
+
 #include <memory>
 
-#include "ChickenRenderer.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/Chicken.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Chicken.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/CowRenderer.cpp b/targets/minecraft/client/renderer/entity/CowRenderer.cpp
index cb7093395..b76e9e406 100644
--- a/targets/minecraft/client/renderer/entity/CowRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/CowRenderer.cpp
@@ -1,6 +1,7 @@
+#include "CowRenderer.h"
+
 #include <memory>
 
-#include "CowRenderer.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
diff --git a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp
index 9da6276ba..6b261c51e 100644
--- a/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/CreeperRenderer.cpp
@@ -1,15 +1,17 @@
+#include "CreeperRenderer.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <memory>
 
-#include "CreeperRenderer.h"
-#include "minecraft/client/model/CreeperModel.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/Creeper.h"
+#include "minecraft/client/model/CreeperModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Creeper.h"
 
 ResourceLocation CreeperRenderer::POWER_LOCATION =
     ResourceLocation(TN_POWERED_CREEPER);
diff --git a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp
index e70de4d7b..087f95479 100644
--- a/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/DefaultRenderer.cpp
@@ -1,4 +1,5 @@
 #include "DefaultRenderer.h"
+
 #include "4J.Render/4J_Render.h"
 
 void DefaultRenderer::render(std::shared_ptr<Entity> entity, double x, double y,
diff --git a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp
index 09d4b8ca6..aa1fce2e9 100644
--- a/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp
@@ -1,8 +1,9 @@
+#include "EnderCrystalRenderer.h"
+
 #include <cmath>
 
 #include "minecraft/client/model/dragon/EnderCrystalModel.h"
 #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "EnderCrystalRenderer.h"
 
 ResourceLocation EnderCrystalRenderer::ENDER_CRYSTAL_LOCATION =
     ResourceLocation(TN_MOB_ENDERDRAGON_ENDERCRYSTAL);
diff --git a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp
index 4af5a5374..7ed171d0e 100644
--- a/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/EnderDragonRenderer.cpp
@@ -1,11 +1,12 @@
+#include "EnderDragonRenderer.h"
+
 #include <cmath>
 
-#include "minecraft/client/model/dragon/DragonModel.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/Lighting.h"
-#include "EnderDragonRenderer.h"
+#include "minecraft/client/model/dragon/DragonModel.h"
 #include "minecraft/client/renderer/BossMobGuiInfo.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
 
 ResourceLocation EnderDragonRenderer::DRAGON_EXPLODING_LOCATION =
     ResourceLocation(TN_MOB_ENDERDRAGON_SHUFFLE);
diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp
index b3f50bf1d..f6f054d55 100644
--- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp
@@ -1,19 +1,21 @@
+#include "EndermanRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "EndermanRenderer.h"
-#include "minecraft/client/model/EndermanModel.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/EndermanModel.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/monster/EnderMan.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION =
     ResourceLocation(TN_MOB_ENDERMAN_EYES);
diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp
index 5524eee13..330b24b71 100644
--- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp
+++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp
@@ -1,88 +1,89 @@
+#include "EntityRenderDispatcher.h"
+
 #include <cmath>
 
-#include "EntityRenderDispatcher.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
-#include "SpiderRenderer.h"
-#include "PigRenderer.h"
-#include "SheepRenderer.h"
-#include "CowRenderer.h"
-#include "WolfRenderer.h"
-#include "ChickenRenderer.h"
-#include "CreeperRenderer.h"
-#include "SlimeRenderer.h"
-#include "PlayerRenderer.h"
-#include "GhastRenderer.h"
-#include "SquidRenderer.h"
-#include "MobRenderer.h"
-#include "GiantMobRenderer.h"
-#include "EntityRenderer.h"
-#include "PaintingRenderer.h"
 #include "ArrowRenderer.h"
+#include "BatRenderer.h"
+#include "BlazeRenderer.h"
+#include "BoatRenderer.h"
+#include "CaveSpiderRenderer.h"
+#include "ChickenRenderer.h"
+#include "CowRenderer.h"
+#include "CreeperRenderer.h"
+#include "DefaultRenderer.h"
+#include "EnderCrystalRenderer.h"
+#include "EnderDragonRenderer.h"
+#include "EndermanRenderer.h"
+#include "EntityRenderer.h"
+#include "ExperienceOrbRenderer.h"
+#include "FallingTileRenderer.h"
 #include "FireballRenderer.h"
+#include "FishingHookRenderer.h"
+#include "GhastRenderer.h"
+#include "GiantMobRenderer.h"
+#include "HorseRenderer.h"
+#include "HumanoidMobRenderer.h"
+#include "ItemFrameRenderer.h"
 #include "ItemRenderer.h"
 #include "ItemSpriteRenderer.h"
-#include "TntRenderer.h"
-#include "FallingTileRenderer.h"
-#include "MinecartRenderer.h"
-#include "BoatRenderer.h"
-#include "FishingHookRenderer.h"
-#include "LightningBoltRenderer.h"
-#include "HumanoidMobRenderer.h"
-#include "DefaultRenderer.h"
-#include "EndermanRenderer.h"
-#include "ExperienceOrbRenderer.h"
-#include "SilverfishRenderer.h"
-#include "MushroomCowRenderer.h"
-#include "SnowManRenderer.h"
 #include "LavaSlimeRenderer.h"
-#include "VillagerRenderer.h"
-#include "EnderDragonRenderer.h"
-#include "EnderCrystalRenderer.h"
-#include "BlazeRenderer.h"
+#include "LeashKnotRenderer.h"
+#include "LightningBoltRenderer.h"
+#include "MinecartRenderer.h"
+#include "MinecartSpawnerRenderer.h"
+#include "MobRenderer.h"
+#include "MushroomCowRenderer.h"
+#include "OcelotRenderer.h"
+#include "PaintingRenderer.h"
+#include "PigRenderer.h"
+#include "PlayerRenderer.h"
+#include "SheepRenderer.h"
+#include "SilverfishRenderer.h"
 #include "SkeletonRenderer.h"
+#include "SlimeRenderer.h"
+#include "SnowManRenderer.h"
+#include "SpiderRenderer.h"
+#include "SquidRenderer.h"
+#include "TntMinecartRenderer.h"
+#include "TntRenderer.h"
+#include "VillagerGolemRenderer.h"
+#include "VillagerRenderer.h"
 #include "WitchRenderer.h"
 #include "WitherBossRenderer.h"
-#include "LeashKnotRenderer.h"
 #include "WitherSkullRenderer.h"
-#include "TntMinecartRenderer.h"
-#include "MinecartSpawnerRenderer.h"
-#include "HorseRenderer.h"
-#include "minecraft/client/model/SpiderModel.h"
-#include "minecraft/client/model/PigModel.h"
-#include "minecraft/client/model/SheepModel.h"
-#include "minecraft/client/model/CowModel.h"
-#include "minecraft/client/model/WolfModel.h"
-#include "minecraft/client/model/ChickenModel.h"
-#include "minecraft/client/model/CreeperModel.h"
-#include "minecraft/client/model/SlimeModel.h"
-#include "minecraft/client/model/GhastModel.h"
-#include "minecraft/client/model/SquidModel.h"
-#include "minecraft/client/model/MinecartModel.h"
-#include "minecraft/client/model/BoatModel.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/client/model/SheepFurModel.h"
-#include "minecraft/client/model/SkeletonModel.h"
-#include "minecraft/client/model/ModelHorse.h"
-#include "minecraft/client/Options.h"
-#include "ItemFrameRenderer.h"
-#include "OcelotRenderer.h"
-#include "VillagerGolemRenderer.h"
-#include "minecraft/client/model/OcelotModel.h"
+#include "WolfRenderer.h"
 #include "ZombieRenderer.h"
-#include "BatRenderer.h"
-#include "CaveSpiderRenderer.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/model/BoatModel.h"
+#include "minecraft/client/model/ChickenModel.h"
+#include "minecraft/client/model/CowModel.h"
+#include "minecraft/client/model/CreeperModel.h"
+#include "minecraft/client/model/GhastModel.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/MinecartModel.h"
+#include "minecraft/client/model/ModelHorse.h"
+#include "minecraft/client/model/OcelotModel.h"
+#include "minecraft/client/model/PigModel.h"
+#include "minecraft/client/model/SheepFurModel.h"
+#include "minecraft/client/model/SheepModel.h"
+#include "minecraft/client/model/SkeletonModel.h"
+#include "minecraft/client/model/SlimeModel.h"
+#include "minecraft/client/model/SpiderModel.h"
+#include "minecraft/client/model/SquidModel.h"
+#include "minecraft/client/model/WolfModel.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
+#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 double EntityRenderDispatcher::xOff = 0.0;
 double EntityRenderDispatcher::yOff = 0.0;
diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h
index 5ba00bbca..3df13c952 100644
--- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h
+++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EntityRenderer.h"
-#include "minecraft/world/entity/Entity.h"
 #include "java/JavaIntHash.h"
+#include "minecraft/world/entity/Entity.h"
 class font;
 
 class EntityRenderDispatcher {
diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp
index 68dc469dc..99cf9eb63 100644
--- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp
@@ -1,24 +1,25 @@
+#include "EntityRenderer.h"
+
 #include <GL/gl.h>
 
-#include "EntityRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/util/Mth.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "java/Class.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/animal/Animal.h"
+#include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/FireTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "java/Class.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/phys/AABB.h"
 
 ResourceLocation EntityRenderer::SHADOW_LOCATION =
     ResourceLocation(TN__CLAMP__MISC_SHADOW);
diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.h b/targets/minecraft/client/renderer/entity/EntityRenderer.h
index e1dd597d1..996c6ccf9 100644
--- a/targets/minecraft/client/renderer/entity/EntityRenderer.h
+++ b/targets/minecraft/client/renderer/entity/EntityRenderer.h
@@ -3,10 +3,10 @@
 #include <string>
 
 #include "minecraft/client/model/geom/Model.h"
-#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/TileRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 
 class Tile;
diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp
index 2ad226db6..ef89b802c 100644
--- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp
@@ -1,17 +1,19 @@
+#include "ExperienceOrbRenderer.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "ExperienceOrbRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/ExperienceOrb.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/ExperienceOrb.h"
 
 ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION =
     ResourceLocation(TN_ITEM_EXPERIENCE_ORB);
diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp
index 11100192e..38125c57d 100644
--- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp
@@ -1,19 +1,21 @@
+#include "FallingTileRenderer.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <memory>
 
-#include "FallingTileRenderer.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/TileRenderer.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/item/FallingTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/AnvilTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/entity/EntityRenderer.h"
 
 FallingTileRenderer::FallingTileRenderer() : EntityRenderer() {
     tileRenderer = new TileRenderer();
diff --git a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp
index 014a33c09..76ae727c7 100644
--- a/targets/minecraft/client/renderer/entity/FireballRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/FireballRenderer.cpp
@@ -1,10 +1,14 @@
+#include "FireballRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "FireballRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "java/Class.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/projectile/Fireball.h"
@@ -12,8 +16,6 @@
 #include "minecraft/world/level/tile/FireTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
-#include "java/Class.h"
-#include "minecraft/client/renderer/Tesselator.h"
 
 FireballRenderer::FireballRenderer(float scale) { this->scale = scale; }
 
diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp
index 319034191..e3391bce8 100644
--- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp
@@ -1,20 +1,22 @@
+#include "FishingHookRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "FishingHookRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/player/Player.h"
-#include "minecraft/world/entity/projectile/FishingHook.h"
+#include "EntityRenderDispatcher.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/projectile/FishingHook.h"
+#include "minecraft/world/phys/Vec3.h"
 
 ResourceLocation FishingHookRenderer::PARTICLE_LOCATION =
     ResourceLocation(TN_PARTICLES);
diff --git a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp
index fc80c0ec1..13a364a97 100644
--- a/targets/minecraft/client/renderer/entity/GhastRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/GhastRenderer.cpp
@@ -1,14 +1,15 @@
+#include "GhastRenderer.h"
+
 #include <memory>
 
-#include "GhastRenderer.h"
-#include "minecraft/client/model/GhastModel.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/Ghast.h"
+#include "minecraft/client/model/GhastModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Ghast.h"
 
 ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST);
 ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION =
diff --git a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp
index 9eae2bae6..13a92fc62 100644
--- a/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/GiantMobRenderer.cpp
@@ -1,6 +1,7 @@
+#include "GiantMobRenderer.h"
+
 #include <memory>
 
-#include "GiantMobRenderer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp
index 93e117487..1a5f942c9 100644
--- a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp
@@ -1,16 +1,17 @@
+#include "HorseRenderer.h"
+
 #include <utility>
 
-#include "HorseRenderer.h"
-#include "MobRenderer.h"
-#include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/EntityHorse.h"
+#include "EntityRenderDispatcher.h"
+#include "MobRenderer.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/EntityRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/EntityHorse.h"
 
 ResourceLocation HorseRenderer::HORSE_LOCATION =
     ResourceLocation(TN_MOB_HORSE_WHITE);
diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
index fceeb1934..e9da1cc32 100644
--- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
@@ -1,15 +1,21 @@
+#include "HumanoidMobRenderer.h"
+
 #include <utility>
 #include <vector>
 
-#include "HumanoidMobRenderer.h"
-#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/item/ArmorItem.h"
@@ -17,11 +23,6 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "nbt/CompoundTag.h"
-#include "minecraft/client/model/geom/Model.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 const std::wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = {
     L"cloth", L"chain", L"iron", L"diamond", L"gold"};
diff --git a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp
index bb66c0a6b..abb530f54 100644
--- a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp
@@ -1,32 +1,32 @@
 #include <GL/gl.h>
+
 #include <string>
 
-#include "minecraft/client/renderer/TileRenderer.h"
 #include "EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/TileRenderer.h"
 // #include "ItemFrame"
-#include "ItemFrameRenderer.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/client/renderer/texture/custom/CompassTexture.h"
-#include "minecraft/client/gui/Minimap.h"
 #include "4J.Render/4J_Render.h"
+#include "ItemFrameRenderer.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Minimap.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/renderer/texture/custom/CompassTexture.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ItemFrame.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
+#include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/TreeTile.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/resources/ResourceLocation.h"
-#include "minecraft/util/Mth.h"
 
 class MapItemSavedData;
 
diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp
index 6f3421f03..ff4c0b156 100644
--- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp
@@ -1,18 +1,31 @@
+#include "ItemRenderer.h"
+
 #include <GL/gl.h>
 #include <GL/glext.h>
 #include <math.h>
+
 #include <vector>
 
-#include "ItemRenderer.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include "java/JavaMath.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/Options.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/entity/ItemRenderer.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Font.h"
+#include "minecraft/client/gui/Gui.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/client/renderer/entity/ItemRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/Entity.h"
@@ -20,18 +33,6 @@
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Random.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/gui/Font.h"
-#include "minecraft/client/gui/Gui.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/entity/EntityRenderer.h"
-#include "minecraft/util/Mth.h"
 
 class ResourceLocation;
 
diff --git a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp
index 53f442b45..24613884a 100644
--- a/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ItemSpriteRenderer.cpp
@@ -1,18 +1,20 @@
+#include "ItemSpriteRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "ItemSpriteRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/projectile/ThrownPotion.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/PotionItem.h"
 #include "minecraft/world/item/alchemy/PotionBrewing.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/entity/EntityRenderer.h"
 
 ItemSpriteRenderer::ItemSpriteRenderer(Item* sourceItem,
                                        int sourceItemAuxValue /*= 0*/)
diff --git a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp
index fd443d08c..868c3c901 100644
--- a/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/LavaSlimeRenderer.cpp
@@ -1,13 +1,14 @@
+#include "LavaSlimeRenderer.h"
+
 #include <memory>
 
-#include "minecraft/client/model/LavaSlimeModel.h"
-#include "LavaSlimeRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/LavaSlime.h"
+#include "minecraft/client/model/LavaSlimeModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/LavaSlime.h"
 
 ResourceLocation LavaSlimeRenderer::MAGMACUBE_LOCATION =
     ResourceLocation(TN_MOB_LAVA);
diff --git a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp
index 1719c0fb2..01c7c2096 100644
--- a/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/LeashKnotRenderer.cpp
@@ -1,9 +1,11 @@
+#include "LeashKnotRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "LeashKnotRenderer.h"
-#include "minecraft/client/model/LeashKnotModel.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/model/LeashKnotModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/EntityRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
diff --git a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp
index e8ac43d00..5cac0fa2a 100644
--- a/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/LightningBoltRenderer.cpp
@@ -1,12 +1,14 @@
+#include "LightningBoltRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "LightningBoltRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J.Render/4J_Render.h"
+#include "java/Random.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/global/LightningBolt.h"
-#include "java/Random.h"
 
 void LightningBoltRenderer::render(std::shared_ptr<Entity> _bolt, double x,
                                    double y, double z, float rot, float a) {
diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp
index 41d5107aa..2a1bba789 100644
--- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp
@@ -1,31 +1,32 @@
+#include "LivingEntityRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <numbers>
 #include <vector>
 
-#include "LivingEntityRenderer.h"
-#include "minecraft/client/Lighting.h"
-#include "minecraft/client/model/geom/Cube.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "EntityRenderDispatcher.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/world/entity/projectile/Arrow.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/world/entity/player/Player.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
+#include "minecraft/client/model/geom/Cube.h"
 #include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/entity/projectile/Arrow.h"
 
 ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION =
     ResourceLocation(TN__BLUR__MISC_GLINT);
diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h
index 16044fb5e..434bd3508 100644
--- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h
+++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h
@@ -2,8 +2,8 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/client/resources/ResourceLocation.h"
 #include "EntityRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 
 class LivingEntity;
diff --git a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp
index b63b563b0..d5a3f0719 100644
--- a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp
@@ -1,19 +1,21 @@
+#include "MinecartRenderer.h"
+
 #include <math.h>
 #include <stdint.h>
-#include <optional>
-#include <numbers>
 
-#include "MinecartRenderer.h"
-#include "minecraft/client/model/MinecartModel.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include <numbers>
+#include <optional>
+
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/item/Minecart.h"
-#include "minecraft/world/phys/Vec3.h"
+#include "minecraft/client/model/MinecartModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/item/Minecart.h"
+#include "minecraft/world/phys/Vec3.h"
 
 class Tile;
 
diff --git a/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp
index d59121882..a16c05f23 100644
--- a/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/MinecartSpawnerRenderer.cpp
@@ -1,8 +1,9 @@
 #include "MinecartSpawnerRenderer.h"
-#include "minecraft/world/level/tile/Tile.h"
+
+#include "minecraft/client/renderer/entity/MinecartRenderer.h"
 #include "minecraft/client/renderer/tileentity/MobSpawnerRenderer.h"
 #include "minecraft/world/entity/item/MinecartSpawner.h"
-#include "minecraft/client/renderer/entity/MinecartRenderer.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 void MinecartSpawnerRenderer::renderMinecartContents(
     std::shared_ptr<MinecartSpawner> cart, float a, Tile* tile, int tileData) {
diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp
index 66637bb6c..d96707a23 100644
--- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp
@@ -1,21 +1,22 @@
+#include "MobRenderer.h"
+
 #include <GL/gl.h>
 #include <math.h>
+
 #include <numbers>
 
-#include "MobRenderer.h"
-#include "LivingEntityRenderer.h"
-#include "minecraft/util/Mth.h"
-#include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "LivingEntityRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/Mob.h"
 #include "java/Class.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/Mob.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp
index 3c03465b2..d4ee38a6d 100644
--- a/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/MushroomCowRenderer.cpp
@@ -1,19 +1,21 @@
+#include "MushroomCowRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "MushroomCowRenderer.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/model/QuadrupedModel.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/model/QuadrupedModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/MushroomCow.h"
 #include "minecraft/world/level/tile/PlantTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp
index c9b54aaf8..ce207b630 100644
--- a/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/OcelotRenderer.cpp
@@ -1,13 +1,14 @@
+#include "OcelotRenderer.h"
+
 #include <memory>
 
-#include "OcelotRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/Ocelot.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Ocelot.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp
index 88335f5b1..f8dfc6afd 100644
--- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp
@@ -1,16 +1,17 @@
+#include "PaintingRenderer.h"
+
 #include <GL/gl.h>
 
-#include "PaintingRenderer.h"
+#include "4J.Render/4J_Render.h"
 #include "EntityRenderDispatcher.h"
 #include "java/Random.h"
-#include "minecraft/util/Mth.h"
-#include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/Painting.h"
-#include "minecraft/world/level/Level.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/Painting.h"
+#include "minecraft/world/level/Level.h"
 
 ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ);
 
diff --git a/targets/minecraft/client/renderer/entity/PigRenderer.cpp b/targets/minecraft/client/renderer/entity/PigRenderer.cpp
index d4ffe3f97..2fb775b4d 100644
--- a/targets/minecraft/client/renderer/entity/PigRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/PigRenderer.cpp
@@ -1,11 +1,12 @@
+#include "PigRenderer.h"
+
 #include <memory>
 
-#include "PigRenderer.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/Pig.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Pig.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp
index 794b5f955..5660f7ff9 100644
--- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp
@@ -1,20 +1,29 @@
+#include "PlayerRenderer.h"
+
 #include <cmath>
 #include <format>
 #include <numbers>
 #include <vector>
 
-#include "PlayerRenderer.h"
-#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h"
-#include "HumanoidMobRenderer.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
+#include "HumanoidMobRenderer.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/Class.h"
 #include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderer.h"
+#include "minecraft/client/renderer/tileentity/SkullTileRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Inventory.h"
@@ -25,15 +34,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/UseAnim.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "java/Class.h"
 #include "nbt/CompoundTag.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/model/geom/Model.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] =
     {
diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h
index 99a662dcf..2b645fc7e 100644
--- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h
+++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h
@@ -2,12 +2,12 @@
 #include <memory>
 #include <string>
 
-#include "MobRenderer.h"
-#include "minecraft/world/entity/player/Player.h"
 #include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "MobRenderer.h"
 #include "minecraft/client/renderer/entity/LivingEntityRenderer.h"
+#include "minecraft/world/entity/player/Player.h"
 
 class HumanoidModel;
 class LivingEntity;
diff --git a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp
index 3ee63d842..465c3de7c 100644
--- a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp
@@ -1,16 +1,17 @@
+#include "SheepRenderer.h"
+
 #include <memory>
 #include <string>
 
-#include "SheepRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/Sheep.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Sheep.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp b/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp
index de936963a..202ef602a 100644
--- a/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SilverfishRenderer.cpp
@@ -1,6 +1,7 @@
+#include "SilverfishRenderer.h"
+
 #include <memory>
 
-#include "SilverfishRenderer.h"
 #include "minecraft/client/model/SilverfishModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
diff --git a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp
index d5d82f151..50eee5910 100644
--- a/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SkeletonRenderer.cpp
@@ -1,14 +1,15 @@
+#include "SkeletonRenderer.h"
+
 #include <memory>
 
-#include "SkeletonRenderer.h"
-#include "minecraft/client/model/SkeletonModel.h"
-#include "minecraft/world/entity/monster/Skeleton.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/client/model/SkeletonModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/HumanoidMobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Skeleton.h"
 
 ResourceLocation SkeletonRenderer::SKELETON_LOCATION =
     ResourceLocation(TN_MOB_SKELETON);
diff --git a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp
index a2477e13c..d1e964885 100644
--- a/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SlimeRenderer.cpp
@@ -1,13 +1,15 @@
+#include "SlimeRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "SlimeRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/Slime.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Slime.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp
index d0658ea7b..d545812cc 100644
--- a/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SnowManRenderer.cpp
@@ -1,20 +1,21 @@
+#include "SnowManRenderer.h"
+
 #include <memory>
 
+#include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
 #include "minecraft/client/model/SnowManModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
-#include "EntityRenderDispatcher.h"
-#include "SnowManRenderer.h"
-#include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/SnowMan.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/world/item/ItemInstance.h"
-#include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/client/renderer/ItemInHandRenderer.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/TileRenderer.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/SnowMan.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 ResourceLocation SnowManRenderer::SNOWMAN_LOCATION =
     ResourceLocation(TN_MOB_SNOWMAN);
diff --git a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp
index 02594bf68..95eadba0e 100644
--- a/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SpiderRenderer.cpp
@@ -1,15 +1,17 @@
+#include "SpiderRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "SpiderRenderer.h"
-#include "minecraft/client/model/SpiderModel.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/Spider.h"
+#include "minecraft/client/model/SpiderModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Spider.h"
 
 ResourceLocation SpiderRenderer::SPIDER_LOCATION =
     ResourceLocation(TN_MOB_SPIDER);
diff --git a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp
index 72f3127a3..bc7580cdd 100644
--- a/targets/minecraft/client/renderer/entity/SquidRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/SquidRenderer.cpp
@@ -1,12 +1,13 @@
+#include "SquidRenderer.h"
+
 #include <memory>
 
-#include "SquidRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/animal/Squid.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/Squid.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp
index 0fde1e2c8..6c05a6670 100644
--- a/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/TntMinecartRenderer.cpp
@@ -1,13 +1,15 @@
+#include "TntMinecartRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "TntMinecartRenderer.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MinecartRenderer.h"
 #include "minecraft/world/entity/item/Minecart.h"
 #include "minecraft/world/entity/item/MinecartTNT.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MinecartRenderer.h"
 
 void TntMinecartRenderer::renderMinecartContents(
     std::shared_ptr<Minecart> _cart, float a, Tile* tile, int tileData) {
diff --git a/targets/minecraft/client/renderer/entity/TntRenderer.cpp b/targets/minecraft/client/renderer/entity/TntRenderer.cpp
index 01159ae4d..284f6371a 100644
--- a/targets/minecraft/client/renderer/entity/TntRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/TntRenderer.cpp
@@ -1,11 +1,13 @@
+#include "TntRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "TntRenderer.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "minecraft/client/renderer/TileRenderer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/item/PrimedTnt.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp
index 6abf7a4de..129137d14 100644
--- a/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/VillagerGolemRenderer.cpp
@@ -1,22 +1,24 @@
+#include "VillagerGolemRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/VillagerGolemModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
-#include "VillagerGolemRenderer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/VillagerGolemModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/VillagerGolem.h"
 #include "minecraft/world/level/tile/PlantTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation VillagerGolemRenderer::GOLEM_LOCATION =
     ResourceLocation(TN_MOB_VILLAGER_GOLEM);
diff --git a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp
index e87526f43..9491804dd 100644
--- a/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/VillagerRenderer.cpp
@@ -1,14 +1,15 @@
+#include "VillagerRenderer.h"
+
 #include <memory>
 
-#include "minecraft/client/model/VillagerModel.h"
-#include "VillagerRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/npc/Villager.h"
+#include "minecraft/client/model/VillagerModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/MobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/npc/Villager.h"
 
 ResourceLocation VillagerRenderer::VILLAGER_LOCATION =
     ResourceLocation(TN_MOB_VILLAGER_VILLAGER);
diff --git a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp
index 5bad8ef43..e77408df9 100644
--- a/targets/minecraft/client/renderer/entity/WitchRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/WitchRenderer.cpp
@@ -1,12 +1,19 @@
+#include "WitchRenderer.h"
+
 #include <memory>
 #include <vector>
 
-#include "EntityRenderDispatcher.h"
-#include "WitchRenderer.h"
-#include "minecraft/client/model/WitchModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
 #include "4J.Render/4J_Render.h"
+#include "EntityRenderDispatcher.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/WitchModel.h"
+#include "minecraft/client/model/geom/Model.h"
+#include "minecraft/client/model/geom/ModelPart.h"
+#include "minecraft/client/renderer/ItemInHandRenderer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/TileRenderer.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
@@ -14,12 +21,6 @@
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/model/geom/Model.h"
-#include "minecraft/client/renderer/ItemInHandRenderer.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH);
 
diff --git a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp
index e5a77eed5..053e12a70 100644
--- a/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/WitherBossRenderer.cpp
@@ -1,10 +1,11 @@
+#include "WitherBossRenderer.h"
+
 #include <cmath>
 
-#include "WitherBossRenderer.h"
-#include "minecraft/client/model/WitherBossModel.h"
 #include "MobRenderer.h"
-#include "minecraft/world/entity/boss/wither/WitherBoss.h"
+#include "minecraft/client/model/WitherBossModel.h"
 #include "minecraft/client/renderer/BossMobGuiInfo.h"
+#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 
 ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION =
     ResourceLocation(TN_MOB_WITHER_ARMOR);
diff --git a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp
index f3c28f398..c8b313dc4 100644
--- a/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/WitherSkullRenderer.cpp
@@ -1,13 +1,15 @@
+#include "WitherSkullRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "WitherSkullRenderer.h"
-#include "minecraft/client/model/SkeletonHeadModel.h"
-#include "minecraft/world/entity/projectile/WitherSkull.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/entity/Entity.h"
+#include "minecraft/client/model/SkeletonHeadModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/projectile/WitherSkull.h"
 
 ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION(
     TN_MOB_WITHER_INVULNERABLE);
diff --git a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp
index b7f8fe1bd..2c5f2e4aa 100644
--- a/targets/minecraft/client/renderer/entity/WolfRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/WolfRenderer.cpp
@@ -1,17 +1,18 @@
+#include "WolfRenderer.h"
+
 #include <memory>
 
-#include "WolfRenderer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/MobRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Sheep.h"
 #include "minecraft/world/entity/animal/Wolf.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/entity/MobRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 class Model;
 
diff --git a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp
index b01209fa0..b1bb89c51 100644
--- a/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp
+++ b/targets/minecraft/client/renderer/entity/ZombieRenderer.cpp
@@ -1,17 +1,19 @@
+#include "ZombieRenderer.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "minecraft/client/model/ZombieModel.h"
-#include "minecraft/client/model/VillagerZombieModel.h"
-#include "ZombieRenderer.h"
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/LivingEntity.h"
-#include "minecraft/world/entity/monster/Zombie.h"
 #include "java/Class.h"
 #include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/model/VillagerZombieModel.h"
+#include "minecraft/client/model/ZombieModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/entity/HumanoidMobRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/monster/Zombie.h"
 
 ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE);
 ResourceLocation ZombieRenderer::ZOMBIE_LOCATION(TN_MOB_ZOMBIE);
diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
index 030b2bca5..bec8e844f 100644
--- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
@@ -1,21 +1,22 @@
+#include "PreStitchedTextureMap.h"
+
 #include <format>
 #include <utility>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "SimpleIcon.h"
 #include "StitchedTexture.h"
 #include "Texture.h"
 #include "TextureManager.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/renderer/texture/custom/ClockTexture.h"
+#include "minecraft/client/renderer/texture/custom/CompassTexture.h"
 #include "minecraft/client/skins/TexturePack.h"
 #include "minecraft/client/skins/TexturePackRepository.h"
-#include "PreStitchedTextureMap.h"
-#include "SimpleIcon.h"
-#include "minecraft/client/renderer/texture/custom/CompassTexture.h"
-#include "minecraft/client/renderer/texture/custom/ClockTexture.h"
-#include "Minecraft.Client/include/BufferedImage.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/client/renderer/texture/SimpleIcon.cpp b/targets/minecraft/client/renderer/texture/SimpleIcon.cpp
index cd164d185..d4e91680f 100644
--- a/targets/minecraft/client/renderer/texture/SimpleIcon.cpp
+++ b/targets/minecraft/client/renderer/texture/SimpleIcon.cpp
@@ -1,4 +1,5 @@
 #include "SimpleIcon.h"
+
 #include "minecraft/client/renderer/texture/StitchedTexture.h"
 
 SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename,
diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.cpp b/targets/minecraft/client/renderer/texture/StitchSlot.cpp
index 45a35fca2..da6e75ce9 100644
--- a/targets/minecraft/client/renderer/texture/StitchSlot.cpp
+++ b/targets/minecraft/client/renderer/texture/StitchSlot.cpp
@@ -1,9 +1,10 @@
+#include "StitchSlot.h"
+
 #include <algorithm>
 #include <vector>
 
 #include "TextureHolder.h"
 #include "console_helpers/StringHelpers.h"
-#include "StitchSlot.h"
 
 StitchSlot::StitchSlot(int originX, int originY, int width, int height)
     : originX(originX), originY(originY), width(width), height(height) {
diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.h b/targets/minecraft/client/renderer/texture/StitchSlot.h
index f8617682a..1da1b6e6f 100644
--- a/targets/minecraft/client/renderer/texture/StitchSlot.h
+++ b/targets/minecraft/client/renderer/texture/StitchSlot.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <format>
 #include <string>
+#include <vector>
 
 class TextureHolder;
 
diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp
index 52fa0fe74..c76ffff12 100644
--- a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp
+++ b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp
@@ -1,14 +1,15 @@
+#include "StitchedTexture.h"
+
 #include <stdio.h>
 
 #include "Texture.h"
+#include "TextureManager.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/InputOutputStream/BufferedReader.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/renderer/texture/StitchedTexture.h"
 #include "minecraft/client/renderer/texture/custom/ClockTexture.h"
 #include "minecraft/client/renderer/texture/custom/CompassTexture.h"
-#include "StitchedTexture.h"
-#include "TextureManager.h"
-#include "minecraft/client/renderer/texture/StitchedTexture.h"
-#include "minecraft/SharedConstants.h"
-#include "java/InputOutputStream/BufferedReader.h"
 
 StitchedTexture* StitchedTexture::create(const std::wstring& name) {
     // TODO: Generalize?
diff --git a/targets/minecraft/client/renderer/texture/Stitcher.cpp b/targets/minecraft/client/renderer/texture/Stitcher.cpp
index 01278e2ee..dc05f80aa 100644
--- a/targets/minecraft/client/renderer/texture/Stitcher.cpp
+++ b/targets/minecraft/client/renderer/texture/Stitcher.cpp
@@ -1,12 +1,13 @@
+#include "Stitcher.h"
+
 #include <algorithm>
 
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "StitchSlot.h"
 #include "Texture.h"
 #include "TextureHolder.h"
 #include "TextureManager.h"
-#include "Stitcher.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 
 void Stitcher::_init(const std::wstring& name, int maxWidth, int maxHeight,
                      bool forcePowerOfTwo, int forcedScale) {
diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp
index 625a82b4d..819a79826 100644
--- a/targets/minecraft/client/renderer/texture/Texture.cpp
+++ b/targets/minecraft/client/renderer/texture/Texture.cpp
@@ -1,15 +1,17 @@
+#include "Texture.h"
+
 #include <string.h>
+
 #include <cstdint>
 #include <vector>
 
+#include "4J.Render/4J_Render.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "TextureManager.h"
+#include "java/Buffer.h"
 #include "java/ByteBuffer.h"
 #include "minecraft/client/renderer/Rect2i.h"
-#include "TextureManager.h"
-#include "Texture.h"
-#include "4J.Render/4J_Render.h"
-#include "Minecraft.Client/include/BufferedImage.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "java/Buffer.h"
 
 #define MAX_MIP_LEVELS 5
 
diff --git a/targets/minecraft/client/renderer/texture/Texture.h b/targets/minecraft/client/renderer/texture/Texture.h
index e6bc608d3..d1699f23f 100644
--- a/targets/minecraft/client/renderer/texture/Texture.h
+++ b/targets/minecraft/client/renderer/texture/Texture.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <GL/gl.h>
+
 #include <format>
 #include <string>
 #include <vector>
diff --git a/targets/minecraft/client/renderer/texture/TextureAtlas.cpp b/targets/minecraft/client/renderer/texture/TextureAtlas.cpp
index 8fa3bb1dc..1001c97a6 100644
--- a/targets/minecraft/client/renderer/texture/TextureAtlas.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureAtlas.cpp
@@ -1,6 +1,7 @@
 #include "TextureAtlas.h"
-#include "minecraft/client/resources/ResourceLocation.h"
+
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation TextureAtlas::LOCATION_BLOCKS = ResourceLocation(TN_TERRAIN);
 ResourceLocation TextureAtlas::LOCATION_ITEMS = ResourceLocation(TN_GUI_ITEMS);
\ No newline at end of file
diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.cpp b/targets/minecraft/client/renderer/texture/TextureHolder.cpp
index 7a31c6d21..405374769 100644
--- a/targets/minecraft/client/renderer/texture/TextureHolder.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureHolder.cpp
@@ -1,9 +1,10 @@
+#include "TextureHolder.h"
+
 #include <algorithm>
 
 #include "Stitcher.h"
 #include "Texture.h"
 #include "console_helpers/StringHelpers.h"
-#include "TextureHolder.h"
 
 TextureHolder::TextureHolder(Texture* texture) {
     scale = 1.0f;
diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp
index ffa670a81..15908a548 100644
--- a/targets/minecraft/client/renderer/texture/TextureManager.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp
@@ -1,16 +1,18 @@
+#include "TextureManager.h"
+
 #include <wchar.h>
+
 #include <utility>
 #include <vector>
 
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/BufferedImage.h"
 #include "Stitcher.h"
 #include "Texture.h"
+#include "java/File.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/skins/TexturePack.h"
 #include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/Minecraft.h"
-#include "TextureManager.h"
-#include "Minecraft.Client/include/BufferedImage.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "java/File.h"
 
 TextureManager* TextureManager::instance = nullptr;
 
diff --git a/targets/minecraft/client/renderer/texture/TextureManager.h b/targets/minecraft/client/renderer/texture/TextureManager.h
index 66e4ae8e1..0d307f8fa 100644
--- a/targets/minecraft/client/renderer/texture/TextureManager.h
+++ b/targets/minecraft/client/renderer/texture/TextureManager.h
@@ -3,6 +3,7 @@
 #include <format>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 class Texture;
 class Stitcher;
diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp
index 20dd270b7..a08c6d8c0 100644
--- a/targets/minecraft/client/renderer/texture/TextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp
@@ -1,28 +1,30 @@
+#include "TextureMap.h"
+
 #include <wchar.h>
+
 #include <format>
 #include <utility>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Stitcher.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
 #include "StitchSlot.h"
 #include "StitchedTexture.h"
+#include "Stitcher.h"
 #include "Texture.h"
 #include "TextureHolder.h"
 #include "TextureManager.h"
-#include "minecraft/client/skins/TexturePack.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "TextureMap.h"
-#include "Minecraft.Client/include/BufferedImage.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/world/Icon.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/world/level/tile/Tile.h"
 #include "java/InputOutputStream/BufferedReader.h"
 #include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/InputStreamReader.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+#include "minecraft/client/skins/TexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/world/Icon.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 const std::wstring TextureMap::NAME_MISSING_TEXTURE = L"missingno";
 
diff --git a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp
index aef1b14ef..596149baa 100644
--- a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp
+++ b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp
@@ -1,16 +1,17 @@
+#include "ClockTexture.h"
+
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "4J.Common/4J_Compat.h"
+#include "java/JavaMath.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "java/JavaMath.h"
+#include "minecraft/client/renderer/texture/StitchedTexture.h"
 #include "minecraft/client/renderer/texture/Texture.h"
-#include "ClockTexture.h"
-#include "4J.Common/4J_Compat.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/client/renderer/texture/StitchedTexture.h"
 
 ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock") {
     rot = rota = 0.0;
diff --git a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp
index a9aec0994..ca0661efa 100644
--- a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp
+++ b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp
@@ -1,19 +1,21 @@
+#include "CompassTexture.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
 #include <vector>
 
+#include "4J.Common/4J_Compat.h"
+#include "java/JavaMath.h"
+#include "minecraft/Pos.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "java/JavaMath.h"
+#include "minecraft/client/renderer/texture/StitchedTexture.h"
 #include "minecraft/client/renderer/texture/Texture.h"
-#include "CompassTexture.h"
-#include "4J.Common/4J_Compat.h"
-#include "minecraft/Pos.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "minecraft/client/renderer/texture/StitchedTexture.h"
 
 CompassTexture* CompassTexture::instance = nullptr;
 
diff --git a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp
index 3fa2bd767..ca27fde7d 100644
--- a/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/BeaconRenderer.cpp
@@ -1,16 +1,18 @@
+#include "BeaconRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "BeaconRenderer.h"
-#include "minecraft/client/renderer/Tesselator.h"
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/Tesselator.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/entity/BeaconTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation BeaconRenderer::BEAM_LOCATION =
     ResourceLocation(TN_MISC_BEACON_BEAM);
diff --git a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp
index 868e9c26e..cbe102a2e 100644
--- a/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/ChestRenderer.cpp
@@ -1,19 +1,21 @@
+#include "ChestRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 #include <numbers>
 
-#include "ChestRenderer.h"
+#include "4J.Render/4J_Render.h"
 #include "minecraft/client/model/ChestModel.h"
 #include "minecraft/client/model/LargeChestModel.h"
 #include "minecraft/client/model/geom/ModelPart.h"
-#include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/level/tile/ChestTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/ChestTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/renderer/tileentity/TileEntityRenderer.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION =
     ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
diff --git a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp
index 5c08f4b3c..56721eadd 100644
--- a/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/EnchantTableRenderer.cpp
@@ -1,17 +1,18 @@
+#include "EnchantTableRenderer.h"
+
 #include <GL/gl.h>
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/BookModel.h"
-#include "minecraft/util/Mth.h"
-#include "EnchantTableRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/client/model/BookModel.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 ResourceLocation EnchantTableRenderer::BOOK_LOCATION =
     ResourceLocation(TN_ITEM_BOOK);
diff --git a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp
index 444324d4e..ce9362b06 100644
--- a/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/EnderChestRenderer.cpp
@@ -1,15 +1,17 @@
+#include "EnderChestRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 #include <numbers>
 
-#include "minecraft/client/model/geom/ModelPart.h"
-#include "EnderChestRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/client/model/ChestModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/level/tile/entity/EnderChestTileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 ResourceLocation EnderChestRenderer::ENDER_CHEST_LOCATION =
     ResourceLocation(TN_TILE_ENDER_CHEST);
diff --git a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp
index 6c4fe2de0..67941f119 100644
--- a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.cpp
@@ -1,6 +1,7 @@
 #include "MobSpawnerRenderer.h"
-#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
+
 #include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
diff --git a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp
index 791f8b514..c85d4d712 100644
--- a/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/PistonPieceRenderer.cpp
@@ -1,20 +1,22 @@
+#include "PistonPieceRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "PistonPieceRenderer.h"
+#include "4J.Render/4J_Render.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/renderer/Tesselator.h"
-#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/renderer/TileRenderer.h"
-#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h"
-#include "4J.Render/4J_Render.h"
+#include "minecraft/client/renderer/texture/TextureAtlas.h"
+#include "minecraft/client/resources/ResourceLocation.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
 #include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/resources/ResourceLocation.h"
 
 ResourceLocation PistonPieceRenderer::SIGN_LOCATION =
     ResourceLocation(TN_ITEM_SIGN);
diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
index f8ee30695..6cf321e9c 100644
--- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
@@ -1,18 +1,16 @@
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "SignRenderer.h"
 
-#include "minecraft/client/model/SignModel.h"
-#include "minecraft/client/model/geom/ModelPart.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/Gui.h"
-
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/client/model/SignModel.h"
+#include "minecraft/client/model/geom/ModelPart.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN);
 
diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp
index 08e89e71c..98549c5a2 100644
--- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp
@@ -1,18 +1,20 @@
+#include "SkullTileRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "SkullTileRenderer.h"
-#include "minecraft/client/model/SkeletonHeadModel.h"
-#include "minecraft/client/renderer/entity/PlayerRenderer.h"
-#include "minecraft/world/level/tile/entity/SkullTileEntity.h"
 #include "4J.Render/4J_Render.h"
 #include "minecraft/Facing.h"
-#include "minecraft/world/level/tile/SkullTile.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "minecraft/client/model/SkeletonHeadModel.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/client/renderer/Textures.h"
+#include "minecraft/client/renderer/entity/PlayerRenderer.h"
 #include "minecraft/client/renderer/tileentity/TileEntityRenderer.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/level/tile/SkullTile.h"
+#include "minecraft/world/level/tile/entity/SkullTileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 SkullTileRenderer* SkullTileRenderer::instance = nullptr;
 
diff --git a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp
index 5707e66f2..45a3a6e3f 100644
--- a/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/TheEndPortalRenderer.cpp
@@ -1,19 +1,21 @@
+#include "TheEndPortalRenderer.h"
+
 #include <GL/gl.h>
+
 #include <memory>
 
-#include "java/Random.h"
-#include "minecraft/client/renderer/Tesselator.h"
-#include "TileEntityRenderDispatcher.h"
-#include "minecraft/client/Camera.h"
-#include "java/FloatBuffer.h"
-#include "TheEndPortalRenderer.h"
 #include "4J.Render/4J_Render.h"
-#include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "TileEntityRenderDispatcher.h"
+#include "java/FloatBuffer.h"
+#include "java/Random.h"
 #include "java/System.h"
+#include "minecraft/client/Camera.h"
 #include "minecraft/client/MemoryTracker.h"
+#include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
+#include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION =
     ResourceLocation(TN_MISC_TUNNEL);
diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp
index a5f3add9b..bcb2f22e7 100644
--- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp
+++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.cpp
@@ -1,18 +1,20 @@
+#include "TileEntityRenderDispatcher.h"
+
 #include <GL/gl.h>
+
 #include <utility>
 
-#include "TileEntityRenderDispatcher.h"
-#include "TileEntityRenderer.h"
-#include "SignRenderer.h"
-#include "MobSpawnerRenderer.h"
-#include "PistonPieceRenderer.h"
+#include "4J.Render/4J_Render.h"
+#include "BeaconRenderer.h"
 #include "ChestRenderer.h"
 #include "EnchantTableRenderer.h"
-#include "TheEndPortalRenderer.h"
-#include "SkullTileRenderer.h"
 #include "EnderChestRenderer.h"
-#include "BeaconRenderer.h"
-#include "4J.Render/4J_Render.h"
+#include "MobSpawnerRenderer.h"
+#include "PistonPieceRenderer.h"
+#include "SignRenderer.h"
+#include "SkullTileRenderer.h"
+#include "TheEndPortalRenderer.h"
+#include "TileEntityRenderer.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h
index d84332f76..c73cb4a25 100644
--- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h
+++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h
@@ -2,9 +2,9 @@
 #include <memory>
 #include <unordered_map>
 
-#include "minecraft/client/renderer/Textures.h"
-#include "java/JavaIntHash.h"
 #include "java/Class.h"
+#include "java/JavaIntHash.h"
+#include "minecraft/client/renderer/Textures.h"
 
 class Mob;
 class Level;
diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp
index 3a3ecdd19..e5799bd7d 100644
--- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp
@@ -1,4 +1,5 @@
 #include "TileEntityRenderer.h"
+
 #include "TileEntityRenderDispatcher.h"
 #include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/resources/ResourceLocation.h"
diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp
index e374ca849..80dcbb733 100644
--- a/targets/minecraft/client/skins/AbstractTexturePack.cpp
+++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp
@@ -1,20 +1,22 @@
+#include "AbstractTexturePack.h"
+
 #include <GL/gl.h>
 #include <wchar.h>
+
 #include <vector>
 
-#include "minecraft/client/renderer/Textures.h"
-#include "AbstractTexturePack.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/File.h"
 #include "java/InputOutputStream/BufferedReader.h"
 #include "java/InputOutputStream/FileInputStream.h"
 #include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/InputStreamReader.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/client/skins/TexturePack.h"
 
 AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file,
diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp
index da28d9e1c..9370d8d36 100644
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@@ -1,33 +1,34 @@
+#include "DLCTexturePack.h"
+
 #include <cstdint>
-#include <limits>
 #include <cwchar>
+#include <limits>
 #include <vector>
 
-#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
-#include "DLCTexturePack.h"
-#include "Minecraft.Client/Common/src/DLC/DLCColourTableFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCUIDataFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCTextureFile.h"
-#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
-#include "console_helpers/PortableFileIO.h"
-#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
-#include "Minecraft.Client/Common/src/DLC/DLCAudioFile.h"
+#include "4J_Input.h"
 #include "4J_Profile.h"
 #include "4J_Storage.h"
-#include "4J_Input.h"
-#include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/Common/src/DLC/DLCAudioFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCColourTableFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/DLC/DLCTextureFile.h"
+#include "Minecraft.Client/Common/src/DLC/DLCUIDataFile.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "console_helpers/PortableFileIO.h"
 #include "java/File.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/skins/AbstractTexturePack.h"
diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h
index af9b6321a..d0c4963ec 100644
--- a/targets/minecraft/client/skins/DLCTexturePack.h
+++ b/targets/minecraft/client/skins/DLCTexturePack.h
@@ -3,8 +3,8 @@
 #include <cstdint>
 #include <string>
 
-#include "AbstractTexturePack.h"
 #include "4J.Common/4J_Compat.h"
+#include "AbstractTexturePack.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 
 class DLCPack;
diff --git a/targets/minecraft/client/skins/DefaultTexturePack.cpp b/targets/minecraft/client/skins/DefaultTexturePack.cpp
index e9f94519e..92486603d 100644
--- a/targets/minecraft/client/skins/DefaultTexturePack.cpp
+++ b/targets/minecraft/client/skins/DefaultTexturePack.cpp
@@ -1,7 +1,8 @@
 
 #include "DefaultTexturePack.h"
-#include "minecraft/client/renderer/Textures.h"
+
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/client/renderer/Textures.h"
 
 DefaultTexturePack::DefaultTexturePack()
     : AbstractTexturePack(0, nullptr, L"Minecraft", nullptr) {
diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h
index f259f171e..178e0dbe5 100644
--- a/targets/minecraft/client/skins/DefaultTexturePack.h
+++ b/targets/minecraft/client/skins/DefaultTexturePack.h
@@ -1,10 +1,7 @@
 #pragma once
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "AbstractTexturePack.h"
-
+#include "Minecraft.Client/include/stdafx.h"
 #include "java/InputOutputStream/InputStream.h"
-
 #include "strings.h"
 
 class DefaultTexturePack : public AbstractTexturePack {
diff --git a/targets/minecraft/client/skins/FileTexturePack.cpp b/targets/minecraft/client/skins/FileTexturePack.cpp
index 38c37740c..f05e3d427 100644
--- a/targets/minecraft/client/skins/FileTexturePack.cpp
+++ b/targets/minecraft/client/skins/FileTexturePack.cpp
@@ -1,4 +1,5 @@
 #include "FileTexturePack.h"
+
 #include "java/File.h"
 #include "minecraft/client/skins/AbstractTexturePack.h"
 
diff --git a/targets/minecraft/client/skins/FolderTexturePack.cpp b/targets/minecraft/client/skins/FolderTexturePack.cpp
index c8ce44e07..69379f428 100644
--- a/targets/minecraft/client/skins/FolderTexturePack.cpp
+++ b/targets/minecraft/client/skins/FolderTexturePack.cpp
@@ -1,4 +1,5 @@
 #include "FolderTexturePack.h"
+
 #include "java/File.h"
 #include "java/InputOutputStream/InputStream.h"
 #include "minecraft/client/skins/AbstractTexturePack.h"
diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp
index 9830b0a1d..41ab22d23 100644
--- a/targets/minecraft/client/skins/TexturePackRepository.cpp
+++ b/targets/minecraft/client/skins/TexturePackRepository.cpp
@@ -1,19 +1,18 @@
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "TexturePackRepository.h"
+
+#include "4J_Input.h"
+#include "DLCTexturePack.h"
 #include "DefaultTexturePack.h"
 #include "FileTexturePack.h"
 #include "FolderTexturePack.h"
-#include "DLCTexturePack.h"
-#include "minecraft/client/Options.h"
-#include "java/File.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/client/gui/Minimap.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "4J_Input.h"
-
+#include "Minecraft.Client/include/stdafx.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/File.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/client/gui/Minimap.h"
 #include "strings.h"
 
 TexturePack* TexturePackRepository::DEFAULT_TEXTURE_PACK = nullptr;
diff --git a/targets/minecraft/client/skins/TexturePackRepository.h b/targets/minecraft/client/skins/TexturePackRepository.h
index 5965b1c28..81fe815a0 100644
--- a/targets/minecraft/client/skins/TexturePackRepository.h
+++ b/targets/minecraft/client/skins/TexturePackRepository.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <unordered_map>
+
 #include "TexturePack.h"
 #include "java/File.h"
 
diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp
index 49ae37857..51f30ccea 100644
--- a/targets/minecraft/client/title/TitleScreen.cpp
+++ b/targets/minecraft/client/title/TitleScreen.cpp
@@ -1,23 +1,25 @@
+#include "TitleScreen.h"
+
 #include <stdint.h>
+
 #include <vector>
 
-#include "minecraft/client/gui/Button.h"
-#include "minecraft/client/gui/OptionsScreen.h"
-#include "minecraft/client/gui/SelectWorldScreen.h"
-#include "minecraft/client/gui/JoinMultiplayerScreen.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "console_helpers/StringHelpers.h"
-#include "java/Random.h"
-#include "TitleScreen.h"
 #include "4J.Render/4J_Render.h"
-#include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/locale/Language.h"
+#include "Minecraft.Client/include/BufferedImage.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/InputOutputStream/BufferedReader.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/InputStreamReader.h"
+#include "java/Random.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/gui/Button.h"
+#include "minecraft/client/gui/JoinMultiplayerScreen.h"
+#include "minecraft/client/gui/OptionsScreen.h"
+#include "minecraft/client/gui/SelectWorldScreen.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/locale/Language.h"
 
 Random* TitleScreen::random = new Random();
 
diff --git a/targets/minecraft/commands/Command.cpp b/targets/minecraft/commands/Command.cpp
index 654aafa84..f54f306e1 100644
--- a/targets/minecraft/commands/Command.cpp
+++ b/targets/minecraft/commands/Command.cpp
@@ -1,9 +1,10 @@
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
 #include "Command.h"
+
 #include "minecraft/commands/AdminLogCommand.h"
 #include "minecraft/commands/CommandSender.h"
 #include "minecraft/network/packet/ChatPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
 
 AdminLogCommand* Command::logger;
 
diff --git a/targets/minecraft/commands/Command.h b/targets/minecraft/commands/Command.h
index 1ece8e27f..342c10e73 100644
--- a/targets/minecraft/commands/Command.h
+++ b/targets/minecraft/commands/Command.h
@@ -3,13 +3,14 @@
 // 4J Stu - Based loosely on the Java versions
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
 
+#include "4J.Common/4J_Compat.h"
 #include "CommandsEnum.h"
 #include "minecraft/network/packet/ChatPacket.h"
-#include "4J.Common/4J_Compat.h"
 
 class AdminLogCommand;
 class CommandSender;
diff --git a/targets/minecraft/commands/CommandDispatcher.cpp b/targets/minecraft/commands/CommandDispatcher.cpp
index efda74407..baf022a69 100644
--- a/targets/minecraft/commands/CommandDispatcher.cpp
+++ b/targets/minecraft/commands/CommandDispatcher.cpp
@@ -1,7 +1,8 @@
+#include "CommandDispatcher.h"
+
 #include <string>
 #include <utility>
 
-#include "CommandDispatcher.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/commands/Command.h"
 #include "minecraft/commands/CommandSender.h"
diff --git a/targets/minecraft/commands/CommandDispatcher.h b/targets/minecraft/commands/CommandDispatcher.h
index cf93ed9d7..f80818ffc 100644
--- a/targets/minecraft/commands/CommandDispatcher.h
+++ b/targets/minecraft/commands/CommandDispatcher.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
-#include <vector>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 #include "minecraft/commands/CommandsEnum.h"
 
diff --git a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp
index 456e1bd0a..d18e9baa4 100644
--- a/targets/minecraft/commands/common/DefaultGameModeCommand.cpp
+++ b/targets/minecraft/commands/common/DefaultGameModeCommand.cpp
@@ -1,7 +1,7 @@
-#include <memory>
-
 #include "DefaultGameModeCommand.h"
 
+#include <memory>
+
 EGameCommand DefaultGameModeCommand::getId() {
     return eGameCommand_DefaultGameMode;
 }
diff --git a/targets/minecraft/commands/common/EffectCommand.cpp b/targets/minecraft/commands/common/EffectCommand.cpp
index e2fa4d736..c56525459 100644
--- a/targets/minecraft/commands/common/EffectCommand.cpp
+++ b/targets/minecraft/commands/common/EffectCommand.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/commands/common/EffectCommand.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
 #include "minecraft/commands/CommandsEnum.h"
-#include "minecraft/commands/common/EffectCommand.h"
 
 class CommandSender;
 
diff --git a/targets/minecraft/commands/common/EffectCommand.h b/targets/minecraft/commands/common/EffectCommand.h
index c00b39a4f..9a95b7719 100644
--- a/targets/minecraft/commands/common/EffectCommand.h
+++ b/targets/minecraft/commands/common/EffectCommand.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <string>
 
 #include "minecraft/commands/Command.h"
diff --git a/targets/minecraft/commands/common/EnchantItemCommand.cpp b/targets/minecraft/commands/common/EnchantItemCommand.cpp
index 4cbfd65a3..fbddf2127 100644
--- a/targets/minecraft/commands/common/EnchantItemCommand.cpp
+++ b/targets/minecraft/commands/common/EnchantItemCommand.cpp
@@ -1,20 +1,21 @@
+#include "EnchantItemCommand.h"
+
 #include <string>
 #include <vector>
 
-#include "minecraft/server/level/ServerPlayer.h"
-#include "EnchantItemCommand.h"
 #include "4J.Common/4J_Compat.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/network/packet/GameCommandPacket.h"
+#include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 EGameCommand EnchantItemCommand::getId() { return eGameCommand_EnchantItem; }
 
diff --git a/targets/minecraft/commands/common/EnchantItemCommand.h b/targets/minecraft/commands/common/EnchantItemCommand.h
index 49838e719..7494313d7 100644
--- a/targets/minecraft/commands/common/EnchantItemCommand.h
+++ b/targets/minecraft/commands/common/EnchantItemCommand.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "minecraft/commands/Command.h"
diff --git a/targets/minecraft/commands/common/ExperienceCommand.cpp b/targets/minecraft/commands/common/ExperienceCommand.cpp
index 1251ba271..4e7ae5244 100644
--- a/targets/minecraft/commands/common/ExperienceCommand.cpp
+++ b/targets/minecraft/commands/common/ExperienceCommand.cpp
@@ -1,7 +1,7 @@
-#include <memory>
-
 #include "ExperienceCommand.h"
 
+#include <memory>
+
 EGameCommand ExperienceCommand::getId() { return eGameCommand_Experience; }
 
 int ExperienceCommand::getPermissionLevel() { return LEVEL_GAMEMASTERS; }
diff --git a/targets/minecraft/commands/common/GameModeCommand.h b/targets/minecraft/commands/common/GameModeCommand.h
index a17046fb9..3473d0e37 100644
--- a/targets/minecraft/commands/common/GameModeCommand.h
+++ b/targets/minecraft/commands/common/GameModeCommand.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
diff --git a/targets/minecraft/commands/common/GiveItemCommand.cpp b/targets/minecraft/commands/common/GiveItemCommand.cpp
index 870318a04..928313e54 100644
--- a/targets/minecraft/commands/common/GiveItemCommand.cpp
+++ b/targets/minecraft/commands/common/GiveItemCommand.cpp
@@ -1,7 +1,7 @@
+#include "GiveItemCommand.h"
+
 #include <vector>
 
-#include "minecraft/server/level/ServerPlayer.h"
-#include "GiveItemCommand.h"
 #include "4J.Common/4J_Compat.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
@@ -9,6 +9,7 @@
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/network/packet/GameCommandPacket.h"
+#include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/commands/common/GiveItemCommand.h b/targets/minecraft/commands/common/GiveItemCommand.h
index 9046f0884..111729b87 100644
--- a/targets/minecraft/commands/common/GiveItemCommand.h
+++ b/targets/minecraft/commands/common/GiveItemCommand.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
diff --git a/targets/minecraft/commands/common/KillCommand.cpp b/targets/minecraft/commands/common/KillCommand.cpp
index ed460dca7..efed50402 100644
--- a/targets/minecraft/commands/common/KillCommand.cpp
+++ b/targets/minecraft/commands/common/KillCommand.cpp
@@ -1,8 +1,9 @@
+#include "KillCommand.h"
+
 #include <limits>
 #include <memory>
 #include <string>
 
-#include "KillCommand.h"
 #include "minecraft/commands/CommandSender.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/commands/common/TimeCommand.cpp b/targets/minecraft/commands/common/TimeCommand.cpp
index baabc76fa..b26147009 100644
--- a/targets/minecraft/commands/common/TimeCommand.cpp
+++ b/targets/minecraft/commands/common/TimeCommand.cpp
@@ -1,14 +1,15 @@
+#include "TimeCommand.h"
+
 #include <string>
 #include <vector>
 
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "TimeCommand.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/ChatPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerLevel.h"
 
 class CommandSender;
 
diff --git a/targets/minecraft/commands/common/TimeCommand.h b/targets/minecraft/commands/common/TimeCommand.h
index cf2dd6008..3e959febc 100644
--- a/targets/minecraft/commands/common/TimeCommand.h
+++ b/targets/minecraft/commands/common/TimeCommand.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "minecraft/commands/Command.h"
diff --git a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp
index f0146b25e..dd17303ad 100644
--- a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp
+++ b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp
@@ -1,11 +1,12 @@
+#include "ToggleDownfallCommand.h"
+
 #include <string>
 #include <vector>
 
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "ToggleDownfallCommand.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/network/packet/GameCommandPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/world/level/storage/LevelData.h"
 
 EGameCommand ToggleDownfallCommand::getId() {
diff --git a/targets/minecraft/commands/common/ToggleDownfallCommand.h b/targets/minecraft/commands/common/ToggleDownfallCommand.h
index c9be2155d..df83a48dd 100644
--- a/targets/minecraft/commands/common/ToggleDownfallCommand.h
+++ b/targets/minecraft/commands/common/ToggleDownfallCommand.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "minecraft/commands/Command.h"
diff --git a/targets/minecraft/commands/net.minecraft.commands.h b/targets/minecraft/commands/net.minecraft.commands.h
index 616b2e076..9701ce8b4 100644
--- a/targets/minecraft/commands/net.minecraft.commands.h
+++ b/targets/minecraft/commands/net.minecraft.commands.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "AdminLogCommand.h"
-#include "CommandsEnum.h"
 #include "Command.h"
 #include "CommandDispatcher.h"
-#include "CommandSender.h"
\ No newline at end of file
+#include "CommandSender.h"
+#include "CommandsEnum.h"
\ No newline at end of file
diff --git a/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp b/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp
index 81b8ceb41..0f1987ea6 100644
--- a/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp
+++ b/targets/minecraft/core/AbstractProjectileDispenseBehavior.cpp
@@ -1,15 +1,16 @@
 #include "AbstractProjectileDispenseBehavior.h"
-#include "minecraft/world/level/tile/DispenserTile.h"
-#include "minecraft/world/entity/projectile/Projectile.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/tile/LevelEvent.h"
+
 #include "java/Class.h"
 #include "minecraft/core/BlockSource.h"
 #include "minecraft/core/DefaultDispenseItemBehavior.h"
 #include "minecraft/core/FacingEnum.h"
 #include "minecraft/core/Position.h"
 #include "minecraft/world/entity/Entity.h"
+#include "minecraft/world/entity/projectile/Projectile.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/DispenserTile.h"
+#include "minecraft/world/level/tile/LevelEvent.h"
 
 std::shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(
     BlockSource* source, std::shared_ptr<ItemInstance> dispensed,
diff --git a/targets/minecraft/core/BehaviorRegistry.cpp b/targets/minecraft/core/BehaviorRegistry.cpp
index 1df13a18a..2a2ba5e10 100644
--- a/targets/minecraft/core/BehaviorRegistry.cpp
+++ b/targets/minecraft/core/BehaviorRegistry.cpp
@@ -1,6 +1,7 @@
+#include "BehaviorRegistry.h"
+
 #include <utility>
 
-#include "BehaviorRegistry.h"
 #include "minecraft/core/DispenseItemBehavior.h"
 
 class Item;
diff --git a/targets/minecraft/core/BlockSource.h b/targets/minecraft/core/BlockSource.h
index c29279ad9..bd2a356de 100644
--- a/targets/minecraft/core/BlockSource.h
+++ b/targets/minecraft/core/BlockSource.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include "LocatableSource.h"
 
 class Tile;
diff --git a/targets/minecraft/core/BlockSourceImpl.cpp b/targets/minecraft/core/BlockSourceImpl.cpp
index 6d659c0b7..7dde10e8e 100644
--- a/targets/minecraft/core/BlockSourceImpl.cpp
+++ b/targets/minecraft/core/BlockSourceImpl.cpp
@@ -1,6 +1,7 @@
+#include "BlockSourceImpl.h"
+
 #include <memory>
 
-#include "BlockSourceImpl.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp
index ca918569d..af1a9b8ea 100644
--- a/targets/minecraft/core/DefaultDispenseItemBehavior.cpp
+++ b/targets/minecraft/core/DefaultDispenseItemBehavior.cpp
@@ -1,4 +1,5 @@
 #include "DefaultDispenseItemBehavior.h"
+
 #include "java/Random.h"
 #include "minecraft/core/BlockSource.h"
 #include "minecraft/core/FacingEnum.h"
diff --git a/targets/minecraft/core/ItemDispenseBehaviors.cpp b/targets/minecraft/core/ItemDispenseBehaviors.cpp
index 3a95768ab..437026ec9 100644
--- a/targets/minecraft/core/ItemDispenseBehaviors.cpp
+++ b/targets/minecraft/core/ItemDispenseBehaviors.cpp
@@ -1,7 +1,8 @@
+#include "ItemDispenseBehaviors.h"
+
 #include <memory>
 #include <string>
 
-#include "ItemDispenseBehaviors.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Class.h"
diff --git a/targets/minecraft/core/ItemDispenseBehaviors.h b/targets/minecraft/core/ItemDispenseBehaviors.h
index d0e8f4199..d91a75bfd 100644
--- a/targets/minecraft/core/ItemDispenseBehaviors.h
+++ b/targets/minecraft/core/ItemDispenseBehaviors.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "DefaultDispenseItemBehavior.h"
 #include "AbstractProjectileDispenseBehavior.h"
+#include "DefaultDispenseItemBehavior.h"
 
 class ArrowDispenseBehavior : public AbstractProjectileDispenseBehavior {
 protected:
diff --git a/targets/minecraft/core/LocatableSource.h b/targets/minecraft/core/LocatableSource.h
index ae717be6d..a833e1bb5 100644
--- a/targets/minecraft/core/LocatableSource.h
+++ b/targets/minecraft/core/LocatableSource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Source.h"
 #include "Location.h"
+#include "Source.h"
 
 class LocatableSource : public Source, public Location {};
\ No newline at end of file
diff --git a/targets/minecraft/core/net.minecraft.core.h b/targets/minecraft/core/net.minecraft.core.h
index d67789892..df1bf3056 100644
--- a/targets/minecraft/core/net.minecraft.core.h
+++ b/targets/minecraft/core/net.minecraft.core.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include "AbstractProjectileDispenseBehavior.h"
 #include "Behavior.h"
+#include "BehaviorRegistry.h"
 #include "BlockSource.h"
 #include "BlockSourceImpl.h"
-#include "BehaviorRegistry.h"
-#include "DispenseItemBehavior.h"
 #include "DefaultDispenseItemBehavior.h"
-#include "AbstractProjectileDispenseBehavior.h"
-#include "ItemDispenseBehaviors.h"
+#include "DispenseItemBehavior.h"
 #include "FacingEnum.h"
+#include "ItemDispenseBehaviors.h"
 #include "LocatableSource.h"
 #include "Location.h"
 #include "Position.h"
diff --git a/targets/minecraft/locale/I18n.cpp b/targets/minecraft/locale/I18n.cpp
index 8c7778c08..180ebba66 100644
--- a/targets/minecraft/locale/I18n.cpp
+++ b/targets/minecraft/locale/I18n.cpp
@@ -1,6 +1,7 @@
-#include "Language.h"
 #include "I18n.h"
 
+#include "Language.h"
+
 Language* I18n::lang = Language::getInstance();
 // 4jcraft const & into va_start is ub
 std::wstring I18n::get(std::wstring id, ...) {
diff --git a/targets/minecraft/locale/I18n.h b/targets/minecraft/locale/I18n.h
index d61b070e3..47d8f1b08 100644
--- a/targets/minecraft/locale/I18n.h
+++ b/targets/minecraft/locale/I18n.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdarg.h>
+
 #include <string>
 
 #include "Language.h"
diff --git a/targets/minecraft/locale/Language.cpp b/targets/minecraft/locale/Language.cpp
index 27057a3e2..3217e14e4 100644
--- a/targets/minecraft/locale/Language.cpp
+++ b/targets/minecraft/locale/Language.cpp
@@ -1,10 +1,12 @@
+#include "Language.h"
+
 #include <stdint.h>
 #include <wchar.h>
+
 #include <sstream>
 #include <utility>
 #include <vector>
 
-#include "Language.h"
 #include "java/File.h"
 #include "java/InputOutputStream/FileInputStream.h"
 #include "java/InputOutputStream/InputStream.h"
diff --git a/targets/minecraft/locale/Language.h b/targets/minecraft/locale/Language.h
index e8e4273b9..c91103aaa 100644
--- a/targets/minecraft/locale/Language.h
+++ b/targets/minecraft/locale/Language.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdarg.h>
+
 #include <string>
 #include <unordered_map>
 
diff --git a/targets/minecraft/locale/net.minecraft.locale.h b/targets/minecraft/locale/net.minecraft.locale.h
index b6ed8a10d..a818fcf8a 100644
--- a/targets/minecraft/locale/net.minecraft.locale.h
+++ b/targets/minecraft/locale/net.minecraft.locale.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#include "Language.h"
-#include "I18n.h"
\ No newline at end of file
+#include "I18n.h"
+#include "Language.h"
\ No newline at end of file
diff --git a/targets/minecraft/net.minecraft.h b/targets/minecraft/net.minecraft.h
index 203a8b938..065408d09 100644
--- a/targets/minecraft/net.minecraft.h
+++ b/targets/minecraft/net.minecraft.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Facing.h"
 #include "Direction.h"
+#include "Facing.h"
 #include "Pos.h"
 #include "SharedConstants.h"
\ No newline at end of file
diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp
index 3c8a64613..dfddee740 100644
--- a/targets/minecraft/network/Connection.cpp
+++ b/targets/minecraft/network/Connection.cpp
@@ -1,13 +1,18 @@
+#include "Connection.h"
+
 #include <stdio.h>
 #include <unistd.h>
+
 #include <vector>
 
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Connection.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
 #include "console_helpers/compression.h"
 #include "java/InputOutputStream/BufferedOutputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
@@ -17,9 +22,6 @@
 #include "minecraft/network/packet/KeepAlivePacket.h"
 #include "minecraft/network/packet/Packet.h"
 #include "minecraft/network/packet/PacketListener.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 class SocketAddress;
 
diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h
index 3e1c83df8..ccc525bc9 100644
--- a/targets/minecraft/network/Connection.h
+++ b/targets/minecraft/network/Connection.h
@@ -1,20 +1,20 @@
 #pragma once
 
 #include <stdint.h>
-#include <queue>
-#include <mutex>
+
 #include <memory>
+#include <mutex>
+#include <queue>
 #include <string>
 
-#include "java/System.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/C4JThread.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "console_helpers/C4JThread.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "console_helpers/C4JThread.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/System.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/targets/minecraft/network/packet/AddEntityPacket.cpp b/targets/minecraft/network/packet/AddEntityPacket.cpp
index 126e20160..3b10063d7 100644
--- a/targets/minecraft/network/packet/AddEntityPacket.cpp
+++ b/targets/minecraft/network/packet/AddEntityPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "AddEntityPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/AddEntityPacket.h b/targets/minecraft/network/packet/AddEntityPacket.h
index f4dd88335..61d5b9f1f 100644
--- a/targets/minecraft/network/packet/AddEntityPacket.h
+++ b/targets/minecraft/network/packet/AddEntityPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Packet.h"
diff --git a/targets/minecraft/network/packet/AddExperienceOrbPacket.cpp b/targets/minecraft/network/packet/AddExperienceOrbPacket.cpp
index cbc970832..56dc7d032 100644
--- a/targets/minecraft/network/packet/AddExperienceOrbPacket.cpp
+++ b/targets/minecraft/network/packet/AddExperienceOrbPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "AddExperienceOrbPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp b/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp
index ff0b9ca1e..7a2258570 100644
--- a/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp
+++ b/targets/minecraft/network/packet/AddGlobalEntityPacket.cpp
@@ -1,7 +1,8 @@
+#include "AddGlobalEntityPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "AddGlobalEntityPacket.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/minecraft/network/packet/AddMobPacket.cpp b/targets/minecraft/network/packet/AddMobPacket.cpp
index a42006b6f..f406758b1 100644
--- a/targets/minecraft/network/packet/AddMobPacket.cpp
+++ b/targets/minecraft/network/packet/AddMobPacket.cpp
@@ -1,13 +1,14 @@
+#include "AddMobPacket.h"
+
 #include <vector>
 
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "PacketListener.h"
-#include "AddMobPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 
 AddMobPacket::AddMobPacket() {
     id = -1;
diff --git a/targets/minecraft/network/packet/AddMobPacket.h b/targets/minecraft/network/packet/AddMobPacket.h
index 446c40af8..abb1777cc 100644
--- a/targets/minecraft/network/packet/AddMobPacket.h
+++ b/targets/minecraft/network/packet/AddMobPacket.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 
 #include "Packet.h"
-#include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/network/packet/Packet.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 
 class LivingEntity;
 
diff --git a/targets/minecraft/network/packet/AddPaintingPacket.cpp b/targets/minecraft/network/packet/AddPaintingPacket.cpp
index 2b940d19d..8d57a6b78 100644
--- a/targets/minecraft/network/packet/AddPaintingPacket.cpp
+++ b/targets/minecraft/network/packet/AddPaintingPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "AddPaintingPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Painting.h"
diff --git a/targets/minecraft/network/packet/AddPlayerPacket.cpp b/targets/minecraft/network/packet/AddPlayerPacket.cpp
index af0dcbbad..6f12dd437 100644
--- a/targets/minecraft/network/packet/AddPlayerPacket.cpp
+++ b/targets/minecraft/network/packet/AddPlayerPacket.cpp
@@ -1,16 +1,17 @@
+#include "AddPlayerPacket.h"
+
 #include <vector>
 
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "PacketListener.h"
-#include "AddPlayerPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 AddPlayerPacket::AddPlayerPacket() {
     id = -1;
diff --git a/targets/minecraft/network/packet/AddPlayerPacket.h b/targets/minecraft/network/packet/AddPlayerPacket.h
index 8b637f7e8..c5b150098 100644
--- a/targets/minecraft/network/packet/AddPlayerPacket.h
+++ b/targets/minecraft/network/packet/AddPlayerPacket.h
@@ -5,10 +5,10 @@
 #include <memory>
 #include <string>
 
-#include "Packet.h"
-#include "minecraft/world/entity/SyncedEntityData.h"
 #include "4J.Common/4J_Compat.h"
+#include "Packet.h"
 #include "minecraft/network/packet/Packet.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 
 class Player;
 
diff --git a/targets/minecraft/network/packet/AnimatePacket.cpp b/targets/minecraft/network/packet/AnimatePacket.cpp
index 0a7239cdc..b0e17a6b3 100644
--- a/targets/minecraft/network/packet/AnimatePacket.cpp
+++ b/targets/minecraft/network/packet/AnimatePacket.cpp
@@ -1,7 +1,8 @@
+#include "AnimatePacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "AnimatePacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/AwardStatPacket.cpp b/targets/minecraft/network/packet/AwardStatPacket.cpp
index 2573c47d7..2ae247f22 100644
--- a/targets/minecraft/network/packet/AwardStatPacket.cpp
+++ b/targets/minecraft/network/packet/AwardStatPacket.cpp
@@ -1,7 +1,8 @@
+#include "AwardStatPacket.h"
+
 #include <string.h>
 
 #include "PacketListener.h"
-#include "AwardStatPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/AwardStatPacket.h b/targets/minecraft/network/packet/AwardStatPacket.h
index 41d2acaa8..7457a8b42 100644
--- a/targets/minecraft/network/packet/AwardStatPacket.h
+++ b/targets/minecraft/network/packet/AwardStatPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <vector>
diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp
index 3213660c8..34bf012a6 100644
--- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp
+++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp
@@ -1,15 +1,16 @@
+#include "BlockRegionUpdatePacket.h"
+
 #include <assert.h>
 #include <string.h>
 
-#include "PacketListener.h"
-#include "BlockRegionUpdatePacket.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/world/level/dimension/Dimension.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "PacketListener.h"
 #include "console_helpers/compression.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 
 #define BLOCK_REGION_UPDATE_FULLCHUNK 0x01
 #define BLOCK_REGION_UPDATE_ZEROHEIGHT \
diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h
index fa3f26fc6..d1def51ea 100644
--- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.h
+++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/targets/minecraft/network/packet/ChatPacket.cpp b/targets/minecraft/network/packet/ChatPacket.cpp
index 5026792b6..96d9dadca 100644
--- a/targets/minecraft/network/packet/ChatPacket.cpp
+++ b/targets/minecraft/network/packet/ChatPacket.cpp
@@ -1,9 +1,10 @@
-#include "PacketListener.h"
 #include "ChatPacket.h"
-#include "minecraft/network/packet/ChatPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/world/entity/player/Player.h"
 
 // longest allowed string is "<" + name + "> " + message
diff --git a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp
index b1531ff9e..382ad7dea 100644
--- a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp
+++ b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.cpp
@@ -1,10 +1,11 @@
-#include "PacketListener.h"
 #include "ChunkTilesUpdatePacket.h"
-#include "minecraft/world/level/dimension/Dimension.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 
 ChunkTilesUpdatePacket::~ChunkTilesUpdatePacket() {}
 
diff --git a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h
index 7334fbda9..9a4ff03be 100644
--- a/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h
+++ b/targets/minecraft/network/packet/ChunkTilesUpdatePacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <vector>
diff --git a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp
index 93a08b456..8c6f37f7a 100644
--- a/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp
+++ b/targets/minecraft/network/packet/ChunkVisibilityAreaPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "ChunkVisibilityAreaPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp b/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp
index 99e5d665c..4a5873f90 100644
--- a/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp
+++ b/targets/minecraft/network/packet/ChunkVisibilityPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "ChunkVisibilityPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ClientCommandPacket.cpp b/targets/minecraft/network/packet/ClientCommandPacket.cpp
index b08c9bed4..370ed0033 100644
--- a/targets/minecraft/network/packet/ClientCommandPacket.cpp
+++ b/targets/minecraft/network/packet/ClientCommandPacket.cpp
@@ -1,7 +1,8 @@
+#include "ClientCommandPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ClientCommandPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ComplexItemDataPacket.cpp b/targets/minecraft/network/packet/ComplexItemDataPacket.cpp
index 95dace19c..9473a8fb4 100644
--- a/targets/minecraft/network/packet/ComplexItemDataPacket.cpp
+++ b/targets/minecraft/network/packet/ComplexItemDataPacket.cpp
@@ -1,8 +1,9 @@
+#include "ComplexItemDataPacket.h"
+
 #include <stdint.h>
 #include <string.h>
 
 #include "PacketListener.h"
-#include "ComplexItemDataPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerAckPacket.cpp b/targets/minecraft/network/packet/ContainerAckPacket.cpp
index 899e0ffc8..4f3dfe0e5 100644
--- a/targets/minecraft/network/packet/ContainerAckPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerAckPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerAckPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerAckPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerButtonClickPacket.cpp b/targets/minecraft/network/packet/ContainerButtonClickPacket.cpp
index 8eeb1194a..d44adc234 100644
--- a/targets/minecraft/network/packet/ContainerButtonClickPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerButtonClickPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerButtonClickPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerButtonClickPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerClickPacket.cpp b/targets/minecraft/network/packet/ContainerClickPacket.cpp
index bd3e22be3..6f9334f4c 100644
--- a/targets/minecraft/network/packet/ContainerClickPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerClickPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerClickPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerClickPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/network/packet/ContainerClosePacket.cpp b/targets/minecraft/network/packet/ContainerClosePacket.cpp
index 7f8b588ec..32428080b 100644
--- a/targets/minecraft/network/packet/ContainerClosePacket.cpp
+++ b/targets/minecraft/network/packet/ContainerClosePacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerClosePacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerClosePacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerOpenPacket.cpp b/targets/minecraft/network/packet/ContainerOpenPacket.cpp
index 09d28e249..007054f97 100644
--- a/targets/minecraft/network/packet/ContainerOpenPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerOpenPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "ContainerOpenPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerSetContentPacket.cpp b/targets/minecraft/network/packet/ContainerSetContentPacket.cpp
index 94f93f773..40e7768b5 100644
--- a/targets/minecraft/network/packet/ContainerSetContentPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerSetContentPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerSetContentPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerSetContentPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/network/packet/ContainerSetDataPacket.cpp b/targets/minecraft/network/packet/ContainerSetDataPacket.cpp
index 9ebb8947d..ab14c1372 100644
--- a/targets/minecraft/network/packet/ContainerSetDataPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerSetDataPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerSetDataPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerSetDataPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp b/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp
index 282d7369c..241eae9dd 100644
--- a/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp
+++ b/targets/minecraft/network/packet/ContainerSetSlotPacket.cpp
@@ -1,7 +1,8 @@
+#include "ContainerSetSlotPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ContainerSetSlotPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/network/packet/CraftItemPacket.cpp b/targets/minecraft/network/packet/CraftItemPacket.cpp
index 2328958d6..757f8c126 100644
--- a/targets/minecraft/network/packet/CraftItemPacket.cpp
+++ b/targets/minecraft/network/packet/CraftItemPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "CraftItemPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.cpp b/targets/minecraft/network/packet/CustomPayloadPacket.cpp
index b659fece3..f6a033e83 100644
--- a/targets/minecraft/network/packet/CustomPayloadPacket.cpp
+++ b/targets/minecraft/network/packet/CustomPayloadPacket.cpp
@@ -1,9 +1,10 @@
+#include "CustomPayloadPacket.h"
+
 #include <limits>
 
-#include "PacketListener.h"
-#include "CustomPayloadPacket.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.h b/targets/minecraft/network/packet/CustomPayloadPacket.h
index a0cbc60bb..cfd6a7b6a 100644
--- a/targets/minecraft/network/packet/CustomPayloadPacket.h
+++ b/targets/minecraft/network/packet/CustomPayloadPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
diff --git a/targets/minecraft/network/packet/DebugOptionsPacket.cpp b/targets/minecraft/network/packet/DebugOptionsPacket.cpp
index 94b48a7cd..306049b9c 100644
--- a/targets/minecraft/network/packet/DebugOptionsPacket.cpp
+++ b/targets/minecraft/network/packet/DebugOptionsPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "DebugOptionsPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/DisconnectPacket.cpp b/targets/minecraft/network/packet/DisconnectPacket.cpp
index 11d785aa0..f1cfeebec 100644
--- a/targets/minecraft/network/packet/DisconnectPacket.cpp
+++ b/targets/minecraft/network/packet/DisconnectPacket.cpp
@@ -1,8 +1,10 @@
+#include "minecraft/network/packet/DisconnectPacket.h"
+
 #include <stdio.h>
+
 #include <memory>
 
 #include "PacketListener.h"
-#include "minecraft/network/packet/DisconnectPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
diff --git a/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp b/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp
index 5ac2a1beb..784d12632 100644
--- a/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp
+++ b/targets/minecraft/network/packet/EntityActionAtPositionPacket.cpp
@@ -1,7 +1,8 @@
+#include "EntityActionAtPositionPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "EntityActionAtPositionPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/EntityEventPacket.cpp b/targets/minecraft/network/packet/EntityEventPacket.cpp
index 85ce663dd..0b3cb17e6 100644
--- a/targets/minecraft/network/packet/EntityEventPacket.cpp
+++ b/targets/minecraft/network/packet/EntityEventPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "EntityEventPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/EntityEventPacket.h b/targets/minecraft/network/packet/EntityEventPacket.h
index 0b9904cc0..aa2668839 100644
--- a/targets/minecraft/network/packet/EntityEventPacket.h
+++ b/targets/minecraft/network/packet/EntityEventPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Packet.h"
diff --git a/targets/minecraft/network/packet/ExplodePacket.cpp b/targets/minecraft/network/packet/ExplodePacket.cpp
index 6214c89a8..8a93da9e2 100644
--- a/targets/minecraft/network/packet/ExplodePacket.cpp
+++ b/targets/minecraft/network/packet/ExplodePacket.cpp
@@ -1,7 +1,8 @@
+#include "ExplodePacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "ExplodePacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/phys/Vec3.h"
diff --git a/targets/minecraft/network/packet/ExplodePacket.h b/targets/minecraft/network/packet/ExplodePacket.h
index 87083dd75..8fd89efa0 100644
--- a/targets/minecraft/network/packet/ExplodePacket.h
+++ b/targets/minecraft/network/packet/ExplodePacket.h
@@ -4,7 +4,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include "minecraft/world/level/TilePos.h"
 #include "Packet.h"
 #include "minecraft/network/packet/Packet.h"
 #include "minecraft/world/level/TilePos.h"
diff --git a/targets/minecraft/network/packet/GameCommandPacket.cpp b/targets/minecraft/network/packet/GameCommandPacket.cpp
index b3e486255..38d39759c 100644
--- a/targets/minecraft/network/packet/GameCommandPacket.cpp
+++ b/targets/minecraft/network/packet/GameCommandPacket.cpp
@@ -1,9 +1,10 @@
+#include "GameCommandPacket.h"
+
 #include <limits>
 
-#include "PacketListener.h"
-#include "GameCommandPacket.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/commands/CommandsEnum.h"
diff --git a/targets/minecraft/network/packet/GameCommandPacket.h b/targets/minecraft/network/packet/GameCommandPacket.h
index 4b0f58d93..cd484e750 100644
--- a/targets/minecraft/network/packet/GameCommandPacket.h
+++ b/targets/minecraft/network/packet/GameCommandPacket.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "minecraft/commands/CommandsEnum.h"
 #include "Packet.h"
+#include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/network/packet/Packet.h"
 
 class GameCommandPacket
diff --git a/targets/minecraft/network/packet/GameEventPacket.cpp b/targets/minecraft/network/packet/GameEventPacket.cpp
index 7e550509f..846d1b8a3 100644
--- a/targets/minecraft/network/packet/GameEventPacket.cpp
+++ b/targets/minecraft/network/packet/GameEventPacket.cpp
@@ -1,8 +1,10 @@
-#include <iostream>
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "PacketListener.h"
 #include "GameEventPacket.h"
 
+#include <iostream>
+
+#include "PacketListener.h"
+#include "java/InputOutputStream/InputOutputStream.h"
+
 const int GameEventPacket::NO_RESPAWN_BED_AVAILABLE = 0;
 const int GameEventPacket::START_RAINING = 1;
 const int GameEventPacket::STOP_RAINING = 2;
diff --git a/targets/minecraft/network/packet/GetInfoPacket.cpp b/targets/minecraft/network/packet/GetInfoPacket.cpp
index defb8fd12..0d8878581 100644
--- a/targets/minecraft/network/packet/GetInfoPacket.cpp
+++ b/targets/minecraft/network/packet/GetInfoPacket.cpp
@@ -1,6 +1,7 @@
-#include "PacketListener.h"
 #include "GetInfoPacket.h"
 
+#include "PacketListener.h"
+
 void GetInfoPacket::read(DataInputStream* dis) {}
 
 void GetInfoPacket::write(DataOutputStream* dos) {}
diff --git a/targets/minecraft/network/packet/InteractPacket.cpp b/targets/minecraft/network/packet/InteractPacket.cpp
index 6ada0de21..4e037f8da 100644
--- a/targets/minecraft/network/packet/InteractPacket.cpp
+++ b/targets/minecraft/network/packet/InteractPacket.cpp
@@ -1,7 +1,8 @@
+#include "InteractPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "InteractPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/KeepAlivePacket.cpp b/targets/minecraft/network/packet/KeepAlivePacket.cpp
index 5d7583a89..2f47fc140 100644
--- a/targets/minecraft/network/packet/KeepAlivePacket.cpp
+++ b/targets/minecraft/network/packet/KeepAlivePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "KeepAlivePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/KickPlayerPacket.cpp b/targets/minecraft/network/packet/KickPlayerPacket.cpp
index f04d12486..e62678baf 100644
--- a/targets/minecraft/network/packet/KickPlayerPacket.cpp
+++ b/targets/minecraft/network/packet/KickPlayerPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "KickPlayerPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/LevelEventPacket.cpp b/targets/minecraft/network/packet/LevelEventPacket.cpp
index 4b9790c19..58b94614e 100644
--- a/targets/minecraft/network/packet/LevelEventPacket.cpp
+++ b/targets/minecraft/network/packet/LevelEventPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "LevelEventPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/LevelParticlesPacket.cpp b/targets/minecraft/network/packet/LevelParticlesPacket.cpp
index 507bbfc0e..cdc23d404 100644
--- a/targets/minecraft/network/packet/LevelParticlesPacket.cpp
+++ b/targets/minecraft/network/packet/LevelParticlesPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "LevelParticlesPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/LevelSoundPacket.cpp b/targets/minecraft/network/packet/LevelSoundPacket.cpp
index 8ef620eae..41fc400ef 100644
--- a/targets/minecraft/network/packet/LevelSoundPacket.cpp
+++ b/targets/minecraft/network/packet/LevelSoundPacket.cpp
@@ -1,6 +1,7 @@
+#include "LevelSoundPacket.h"
+
 #include <limits>
 
-#include "LevelSoundPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/PacketListener.h"
diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp
index 31d07f423..425a57f12 100644
--- a/targets/minecraft/network/packet/LoginPacket.cpp
+++ b/targets/minecraft/network/packet/LoginPacket.cpp
@@ -1,14 +1,15 @@
-#include "PacketListener.h"
 #include "LoginPacket.h"
-#include "minecraft/world/level/LevelType.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 LoginPacket::LoginPacket() {
     this->userName = L"";
diff --git a/targets/minecraft/network/packet/LoginPacket.h b/targets/minecraft/network/packet/LoginPacket.h
index 314221b44..318e801cb 100644
--- a/targets/minecraft/network/packet/LoginPacket.h
+++ b/targets/minecraft/network/packet/LoginPacket.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "Packet.h"
 #include "4J.Common/4J_Compat.h"
+#include "Packet.h"
 #include "minecraft/network/packet/Packet.h"
 
 class LevelType;
diff --git a/targets/minecraft/network/packet/MoveEntityPacket.cpp b/targets/minecraft/network/packet/MoveEntityPacket.cpp
index 9e595bef2..b97abfe69 100644
--- a/targets/minecraft/network/packet/MoveEntityPacket.cpp
+++ b/targets/minecraft/network/packet/MoveEntityPacket.cpp
@@ -1,8 +1,9 @@
+#include "MoveEntityPacket.h"
+
 #include <stdint.h>
 
-#include "PacketListener.h"
-#include "MoveEntityPacket.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp
index bc7dcc05b..fea5d4549 100644
--- a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp
+++ b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp
@@ -1,8 +1,9 @@
+#include "MoveEntityPacketSmall.h"
+
 #include <stdint.h>
 
-#include "PacketListener.h"
-#include "MoveEntityPacketSmall.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/MovePlayerPacket.cpp b/targets/minecraft/network/packet/MovePlayerPacket.cpp
index 3c55af654..becc02ee8 100644
--- a/targets/minecraft/network/packet/MovePlayerPacket.cpp
+++ b/targets/minecraft/network/packet/MovePlayerPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "MovePlayerPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp
index 6622b5d24..4c357b5e2 100644
--- a/targets/minecraft/network/packet/Packet.cpp
+++ b/targets/minecraft/network/packet/Packet.cpp
@@ -1,6 +1,9 @@
+#include "Packet.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <format>
 #include <memory>
 #include <sstream>
@@ -10,14 +13,12 @@
 #include <unordered_set>
 #include <vector>
 
-#include "java/System.h"
-#include "Packet.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/Exceptions.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "nbt/NbtIo.h"
+#include "java/System.h"
 #include "minecraft/network/packet/AddEntityPacket.h"
 #include "minecraft/network/packet/AddExperienceOrbPacket.h"
 #include "minecraft/network/packet/AddGlobalEntityPacket.h"
@@ -107,6 +108,7 @@
 #include "minecraft/network/packet/UseItemPacket.h"
 #include "minecraft/network/packet/XZPacket.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "nbt/NbtIo.h"
 
 class CompoundTag;
 
diff --git a/targets/minecraft/network/packet/PacketListener.cpp b/targets/minecraft/network/packet/PacketListener.cpp
index 1622f9e05..bce54a9cd 100644
--- a/targets/minecraft/network/packet/PacketListener.cpp
+++ b/targets/minecraft/network/packet/PacketListener.cpp
@@ -1,4 +1,5 @@
 #include "PacketListener.h"
+
 #include "minecraft/network/packet/AddEntityPacket.h"
 #include "minecraft/network/packet/AddExperienceOrbPacket.h"
 #include "minecraft/network/packet/AddGlobalEntityPacket.h"
diff --git a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp
index b57ea712b..6cd269123 100644
--- a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp
+++ b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp
@@ -1,6 +1,7 @@
+#include "PlayerAbilitiesPacket.h"
+
 #include <stdint.h>
 
-#include "PlayerAbilitiesPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/PacketListener.h"
diff --git a/targets/minecraft/network/packet/PlayerActionPacket.cpp b/targets/minecraft/network/packet/PlayerActionPacket.cpp
index 47f530715..fe5582370 100644
--- a/targets/minecraft/network/packet/PlayerActionPacket.cpp
+++ b/targets/minecraft/network/packet/PlayerActionPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "PlayerActionPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/PlayerCommandPacket.cpp b/targets/minecraft/network/packet/PlayerCommandPacket.cpp
index 833274183..c45face89 100644
--- a/targets/minecraft/network/packet/PlayerCommandPacket.cpp
+++ b/targets/minecraft/network/packet/PlayerCommandPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "PlayerCommandPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.cpp b/targets/minecraft/network/packet/PlayerInfoPacket.cpp
index 4afd4edf3..0a8668d4c 100644
--- a/targets/minecraft/network/packet/PlayerInfoPacket.cpp
+++ b/targets/minecraft/network/packet/PlayerInfoPacket.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/server/network/PlayerConnection.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/PacketListener.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/server/network/PlayerConnection.h"
 #ifndef __linux__
 #include <qnet.h>
 #endif  // __linux__
diff --git a/targets/minecraft/network/packet/PlayerInputPacket.cpp b/targets/minecraft/network/packet/PlayerInputPacket.cpp
index 6948d9551..8c7170297 100644
--- a/targets/minecraft/network/packet/PlayerInputPacket.cpp
+++ b/targets/minecraft/network/packet/PlayerInputPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "PlayerInputPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp
index e87188611..a05dc91da 100644
--- a/targets/minecraft/network/packet/PreLoginPacket.cpp
+++ b/targets/minecraft/network/packet/PreLoginPacket.cpp
@@ -1,14 +1,15 @@
+#include "PreLoginPacket.h"
+
 #include <cstdint>
 #include <cstring>
 
-#include "PacketListener.h"
-#include "PreLoginPacket.h"
+#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 
 PreLoginPacket::PreLoginPacket() {
     loginKey = L"";
diff --git a/targets/minecraft/network/packet/PreLoginPacket.h b/targets/minecraft/network/packet/PreLoginPacket.h
index 11f6a590d..42e622022 100644
--- a/targets/minecraft/network/packet/PreLoginPacket.h
+++ b/targets/minecraft/network/packet/PreLoginPacket.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "Packet.h"
 #include "4J.Common/4J_Compat.h"
+#include "Packet.h"
 #include "minecraft/network/packet/Packet.h"
 
 class PreLoginPacket : public Packet,
diff --git a/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp b/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp
index 3a48e32e5..54a648628 100644
--- a/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp
+++ b/targets/minecraft/network/packet/RemoveEntitiesPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "RemoveEntitiesPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/RemoveEntitiesPacket.h b/targets/minecraft/network/packet/RemoveEntitiesPacket.h
index 5120292d7..51fd9d89b 100644
--- a/targets/minecraft/network/packet/RemoveEntitiesPacket.h
+++ b/targets/minecraft/network/packet/RemoveEntitiesPacket.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <limits>
 #include <format>
+#include <limits>
 #include <memory>
 #include <vector>
 
diff --git a/targets/minecraft/network/packet/RemoveMobEffectPacket.cpp b/targets/minecraft/network/packet/RemoveMobEffectPacket.cpp
index 46176d6c3..48e021469 100644
--- a/targets/minecraft/network/packet/RemoveMobEffectPacket.cpp
+++ b/targets/minecraft/network/packet/RemoveMobEffectPacket.cpp
@@ -1,7 +1,8 @@
+#include "RemoveMobEffectPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "RemoveMobEffectPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
diff --git a/targets/minecraft/network/packet/RespawnPacket.cpp b/targets/minecraft/network/packet/RespawnPacket.cpp
index cb183dd4c..e1444d0c0 100644
--- a/targets/minecraft/network/packet/RespawnPacket.cpp
+++ b/targets/minecraft/network/packet/RespawnPacket.cpp
@@ -1,12 +1,13 @@
+#include "RespawnPacket.h"
+
 #include <string>
 
-#include "PacketListener.h"
-#include "RespawnPacket.h"
-#include "minecraft/world/level/LevelType.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 
 RespawnPacket::RespawnPacket() {
diff --git a/targets/minecraft/network/packet/RespawnPacket.h b/targets/minecraft/network/packet/RespawnPacket.h
index dfc8bd9f0..3152a8628 100644
--- a/targets/minecraft/network/packet/RespawnPacket.h
+++ b/targets/minecraft/network/packet/RespawnPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Packet.h"
diff --git a/targets/minecraft/network/packet/RotateHeadPacket.cpp b/targets/minecraft/network/packet/RotateHeadPacket.cpp
index d84d28ccc..b511f465f 100644
--- a/targets/minecraft/network/packet/RotateHeadPacket.cpp
+++ b/targets/minecraft/network/packet/RotateHeadPacket.cpp
@@ -1,4 +1,5 @@
 #include "RotateHeadPacket.h"
+
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/PacketListener.h"
diff --git a/targets/minecraft/network/packet/RotateHeadPacket.h b/targets/minecraft/network/packet/RotateHeadPacket.h
index cc98bf709..e53bb368f 100644
--- a/targets/minecraft/network/packet/RotateHeadPacket.h
+++ b/targets/minecraft/network/packet/RotateHeadPacket.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "java/InputOutputStream/InputOutputStream.h"
-#include "PacketListener.h"
 #include "Packet.h"
+#include "PacketListener.h"
+#include "java/InputOutputStream/InputOutputStream.h"
 #include "minecraft/network/packet/Packet.h"
 
 class RotateHeadPacket : public Packet,
diff --git a/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp b/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp
index 15b0cecfc..9f8ac9a13 100644
--- a/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp
+++ b/targets/minecraft/network/packet/ServerSettingsChangedPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "ServerSettingsChangedPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetCarriedItemPacket.cpp b/targets/minecraft/network/packet/SetCarriedItemPacket.cpp
index 26f0967ce..1c122515e 100644
--- a/targets/minecraft/network/packet/SetCarriedItemPacket.cpp
+++ b/targets/minecraft/network/packet/SetCarriedItemPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetCarriedItemPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp b/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp
index ff2f39837..b1aa57609 100644
--- a/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp
+++ b/targets/minecraft/network/packet/SetCreativeModeSlotPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetCreativeModeSlotPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp b/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp
index 0356dde64..5bd500c16 100644
--- a/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp
+++ b/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetDisplayObjectivePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/scores/Objective.h"
diff --git a/targets/minecraft/network/packet/SetEntityDataPacket.cpp b/targets/minecraft/network/packet/SetEntityDataPacket.cpp
index dd40a6ca9..9cd0ca6f2 100644
--- a/targets/minecraft/network/packet/SetEntityDataPacket.cpp
+++ b/targets/minecraft/network/packet/SetEntityDataPacket.cpp
@@ -1,7 +1,8 @@
+#include "SetEntityDataPacket.h"
+
 #include <vector>
 
 #include "PacketListener.h"
-#include "SetEntityDataPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
diff --git a/targets/minecraft/network/packet/SetEntityDataPacket.h b/targets/minecraft/network/packet/SetEntityDataPacket.h
index 5adbe67eb..f8b4a10d9 100644
--- a/targets/minecraft/network/packet/SetEntityDataPacket.h
+++ b/targets/minecraft/network/packet/SetEntityDataPacket.h
@@ -4,8 +4,8 @@
 #include <memory>
 
 #include "Packet.h"
-#include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/network/packet/Packet.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 
 class SetEntityDataPacket
     : public Packet,
diff --git a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp
index 02e6037a2..8b2a942e6 100644
--- a/targets/minecraft/network/packet/SetEntityLinkPacket.cpp
+++ b/targets/minecraft/network/packet/SetEntityLinkPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetEntityLinkPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp
index 0ba470a21..3baadb1cb 100644
--- a/targets/minecraft/network/packet/SetEntityMotionPacket.cpp
+++ b/targets/minecraft/network/packet/SetEntityMotionPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetEntityMotionPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp
index 95779ee26..87e6f22bd 100644
--- a/targets/minecraft/network/packet/SetEquippedItemPacket.cpp
+++ b/targets/minecraft/network/packet/SetEquippedItemPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetEquippedItemPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetExperiencePacket.cpp b/targets/minecraft/network/packet/SetExperiencePacket.cpp
index ed1ed1c2b..2480e11dd 100644
--- a/targets/minecraft/network/packet/SetExperiencePacket.cpp
+++ b/targets/minecraft/network/packet/SetExperiencePacket.cpp
@@ -1,4 +1,5 @@
 #include "SetExperiencePacket.h"
+
 #include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/minecraft/network/packet/SetHealthPacket.cpp b/targets/minecraft/network/packet/SetHealthPacket.cpp
index ccc493b86..1a499de58 100644
--- a/targets/minecraft/network/packet/SetHealthPacket.cpp
+++ b/targets/minecraft/network/packet/SetHealthPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetHealthPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetObjectivePacket.cpp b/targets/minecraft/network/packet/SetObjectivePacket.cpp
index 8fb51333d..8e7a38609 100644
--- a/targets/minecraft/network/packet/SetObjectivePacket.cpp
+++ b/targets/minecraft/network/packet/SetObjectivePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetObjectivePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/scores/Objective.h"
diff --git a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp
index 2ad324207..6b4cb629e 100644
--- a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp
+++ b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp
@@ -1,9 +1,10 @@
+#include "SetPlayerTeamPacket.h"
+
 #include <unordered_set>
 
-#include "PacketListener.h"
-#include "SetPlayerTeamPacket.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/network/packet/SetScorePacket.cpp b/targets/minecraft/network/packet/SetScorePacket.cpp
index c759c8816..e607434d3 100644
--- a/targets/minecraft/network/packet/SetScorePacket.cpp
+++ b/targets/minecraft/network/packet/SetScorePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetScorePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp b/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp
index ee0214b24..4a3c2e790 100644
--- a/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp
+++ b/targets/minecraft/network/packet/SetSpawnPositionPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetSpawnPositionPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetTimePacket.cpp b/targets/minecraft/network/packet/SetTimePacket.cpp
index 96ed52a97..9f6f2aa35 100644
--- a/targets/minecraft/network/packet/SetTimePacket.cpp
+++ b/targets/minecraft/network/packet/SetTimePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "SetTimePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/SetTimePacket.h b/targets/minecraft/network/packet/SetTimePacket.h
index 27b85e54a..ab790243a 100644
--- a/targets/minecraft/network/packet/SetTimePacket.h
+++ b/targets/minecraft/network/packet/SetTimePacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Packet.h"
diff --git a/targets/minecraft/network/packet/SignUpdatePacket.cpp b/targets/minecraft/network/packet/SignUpdatePacket.cpp
index a5bbe6e85..1069dc77d 100644
--- a/targets/minecraft/network/packet/SignUpdatePacket.cpp
+++ b/targets/minecraft/network/packet/SignUpdatePacket.cpp
@@ -1,7 +1,8 @@
+#include "SignUpdatePacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "SignUpdatePacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
diff --git a/targets/minecraft/network/packet/TakeItemEntityPacket.cpp b/targets/minecraft/network/packet/TakeItemEntityPacket.cpp
index d927f6a59..8ed165acc 100644
--- a/targets/minecraft/network/packet/TakeItemEntityPacket.cpp
+++ b/targets/minecraft/network/packet/TakeItemEntityPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TakeItemEntityPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/TeleportEntityPacket.cpp b/targets/minecraft/network/packet/TeleportEntityPacket.cpp
index 8e2e8a1a1..a8d9039c2 100644
--- a/targets/minecraft/network/packet/TeleportEntityPacket.cpp
+++ b/targets/minecraft/network/packet/TeleportEntityPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TeleportEntityPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/network/packet/TeleportEntityPacket.h b/targets/minecraft/network/packet/TeleportEntityPacket.h
index bb55143d7..8290565f8 100644
--- a/targets/minecraft/network/packet/TeleportEntityPacket.h
+++ b/targets/minecraft/network/packet/TeleportEntityPacket.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Packet.h"
diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
index da40e0d5d..7be917212 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
+++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
@@ -1,8 +1,9 @@
+#include "TextureAndGeometryChangePacket.h"
+
 #include <sstream>
 
-#include "PacketListener.h"
-#include "TextureAndGeometryChangePacket.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
index 58c049c30..5a7412a92 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
+++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
@@ -1,10 +1,11 @@
+#include "TextureAndGeometryPacket.h"
+
 #include <sstream>
 #include <vector>
 
-#include "PacketListener.h"
-#include "TextureAndGeometryPacket.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h
index cb51f1546..9eb4a96de 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h
+++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h
@@ -4,9 +4,9 @@
 #include <memory>
 #include <string>
 
+#include "Minecraft.Client/include/SkinBox.h"
 #include "Packet.h"
 #include "minecraft/client/model/geom/Model.h"
-#include "Minecraft.Client/include/SkinBox.h"
 #include "minecraft/network/packet/Packet.h"
 
 class DLCSkinFile;
diff --git a/targets/minecraft/network/packet/TextureChangePacket.cpp b/targets/minecraft/network/packet/TextureChangePacket.cpp
index 668a0dc62..313268cb8 100644
--- a/targets/minecraft/network/packet/TextureChangePacket.cpp
+++ b/targets/minecraft/network/packet/TextureChangePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TextureChangePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/network/packet/TexturePacket.cpp b/targets/minecraft/network/packet/TexturePacket.cpp
index d0e8f39a6..55e2940c3 100644
--- a/targets/minecraft/network/packet/TexturePacket.cpp
+++ b/targets/minecraft/network/packet/TexturePacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TexturePacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/TileDestructionPacket.cpp b/targets/minecraft/network/packet/TileDestructionPacket.cpp
index 10de97f31..a7ce9f82b 100644
--- a/targets/minecraft/network/packet/TileDestructionPacket.cpp
+++ b/targets/minecraft/network/packet/TileDestructionPacket.cpp
@@ -1,4 +1,5 @@
 #include "TileDestructionPacket.h"
+
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/PacketListener.h"
diff --git a/targets/minecraft/network/packet/TileEditorOpenPacket.cpp b/targets/minecraft/network/packet/TileEditorOpenPacket.cpp
index f9a6a623b..e5d413d86 100644
--- a/targets/minecraft/network/packet/TileEditorOpenPacket.cpp
+++ b/targets/minecraft/network/packet/TileEditorOpenPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TileEditorOpenPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/TileEntityDataPacket.cpp b/targets/minecraft/network/packet/TileEntityDataPacket.cpp
index eff6d2c41..1dffb33ed 100644
--- a/targets/minecraft/network/packet/TileEntityDataPacket.cpp
+++ b/targets/minecraft/network/packet/TileEntityDataPacket.cpp
@@ -1,7 +1,8 @@
+#include "TileEntityDataPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "TileEntityDataPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "nbt/CompoundTag.h"
diff --git a/targets/minecraft/network/packet/TileEventPacket.cpp b/targets/minecraft/network/packet/TileEventPacket.cpp
index 82a8a3b04..ba31e049a 100644
--- a/targets/minecraft/network/packet/TileEventPacket.cpp
+++ b/targets/minecraft/network/packet/TileEventPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TileEventPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/network/packet/TileUpdatePacket.cpp b/targets/minecraft/network/packet/TileUpdatePacket.cpp
index 46b485a88..9041a11a1 100644
--- a/targets/minecraft/network/packet/TileUpdatePacket.cpp
+++ b/targets/minecraft/network/packet/TileUpdatePacket.cpp
@@ -1,11 +1,12 @@
+#include "TileUpdatePacket.h"
+
 #include <cstdint>
 
 #include "PacketListener.h"
-#include "TileUpdatePacket.h"
-#include "minecraft/world/level/dimension/Dimension.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 
 TileUpdatePacket::TileUpdatePacket() { shouldDelay = true; }
 
diff --git a/targets/minecraft/network/packet/TradeItemPacket.cpp b/targets/minecraft/network/packet/TradeItemPacket.cpp
index cbb187b0b..13811dc17 100644
--- a/targets/minecraft/network/packet/TradeItemPacket.cpp
+++ b/targets/minecraft/network/packet/TradeItemPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "TradeItemPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp
index d30ec5181..f738a4c6f 100644
--- a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp
+++ b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp
@@ -1,7 +1,8 @@
+#include "UpdateAttributesPacket.h"
+
 #include <stdint.h>
 
 #include "PacketListener.h"
-#include "UpdateAttributesPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp
index 0d75ee21c..d42d16e7a 100644
--- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp
+++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp
@@ -1,7 +1,8 @@
+#include "UpdateGameRuleProgressPacket.h"
+
 #include <string.h>
 
 #include "PacketListener.h"
-#include "UpdateGameRuleProgressPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h
index f78733fc6..844e81b67 100644
--- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h
+++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "Packet.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
+#include "Packet.h"
 #include "minecraft/network/packet/Packet.h"
 
 class UpdateGameRuleProgressPacket
diff --git a/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp b/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp
index f541b780b..add5f3577 100644
--- a/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp
+++ b/targets/minecraft/network/packet/UpdateMobEffectPacket.cpp
@@ -1,7 +1,8 @@
+#include "UpdateMobEffectPacket.h"
+
 #include <limits>
 
 #include "PacketListener.h"
-#include "UpdateMobEffectPacket.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
diff --git a/targets/minecraft/network/packet/UpdateProgressPacket.cpp b/targets/minecraft/network/packet/UpdateProgressPacket.cpp
index 6b116af31..411efe612 100644
--- a/targets/minecraft/network/packet/UpdateProgressPacket.cpp
+++ b/targets/minecraft/network/packet/UpdateProgressPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "UpdateProgressPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/UseItemPacket.cpp b/targets/minecraft/network/packet/UseItemPacket.cpp
index a0e2bfddd..b29400dea 100644
--- a/targets/minecraft/network/packet/UseItemPacket.cpp
+++ b/targets/minecraft/network/packet/UseItemPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "UseItemPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/XZPacket.cpp b/targets/minecraft/network/packet/XZPacket.cpp
index 562f5c8bf..0d00d27ba 100644
--- a/targets/minecraft/network/packet/XZPacket.cpp
+++ b/targets/minecraft/network/packet/XZPacket.cpp
@@ -1,5 +1,6 @@
-#include "PacketListener.h"
 #include "XZPacket.h"
+
+#include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/network/packet/net.minecraft.network.packet.h b/targets/minecraft/network/packet/net.minecraft.network.packet.h
index 3705e4774..4a9a10943 100644
--- a/targets/minecraft/network/packet/net.minecraft.network.packet.h
+++ b/targets/minecraft/network/packet/net.minecraft.network.packet.h
@@ -39,13 +39,12 @@
 #include "PreLoginPacket.h"
 #include "RemoveEntitiesPacket.h"
 #include "RespawnPacket.h"
-
 #include "SetCarriedItemPacket.h"
 #include "SetEntityDataPacket.h"
+#include "SetEntityLinkPacket.h"
 #include "SetEntityMotionPacket.h"
 #include "SetEquippedItemPacket.h"
 #include "SetHealthPacket.h"
-#include "SetEntityLinkPacket.h"
 #include "SetSpawnPositionPacket.h"
 #include "SetTimePacket.h"
 #include "SignUpdatePacket.h"
@@ -94,17 +93,17 @@
 #include "UpdateAttributesPacket.h"
 
 // 4J Added
-#include "CraftItemPacket.h"
-#include "TradeItemPacket.h"
-#include "DebugOptionsPacket.h"
-#include "ServerSettingsChangedPacket.h"
-#include "TexturePacket.h"
-#include "TextureAndGeometryPacket.h"
 #include "ChunkVisibilityAreaPacket.h"
-#include "UpdateProgressPacket.h"
-#include "TextureChangePacket.h"
-#include "TextureAndGeometryChangePacket.h"
-#include "UpdateGameRuleProgressPacket.h"
-#include "KickPlayerPacket.h"
-#include "XZPacket.h"
+#include "CraftItemPacket.h"
+#include "DebugOptionsPacket.h"
 #include "GameCommandPacket.h"
+#include "KickPlayerPacket.h"
+#include "ServerSettingsChangedPacket.h"
+#include "TextureAndGeometryChangePacket.h"
+#include "TextureAndGeometryPacket.h"
+#include "TextureChangePacket.h"
+#include "TexturePacket.h"
+#include "TradeItemPacket.h"
+#include "UpdateGameRuleProgressPacket.h"
+#include "UpdateProgressPacket.h"
+#include "XZPacket.h"
diff --git a/targets/minecraft/server/DispenserBootstrap.h b/targets/minecraft/server/DispenserBootstrap.h
index 1a5084376..695676b59 100644
--- a/targets/minecraft/server/DispenserBootstrap.h
+++ b/targets/minecraft/server/DispenserBootstrap.h
@@ -1,7 +1,7 @@
 #pragma once
+#include "minecraft/core/net.minecraft.core.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/tile/DispenserTile.h"
-#include "minecraft/core/net.minecraft.core.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 
 class DispenserBootstrap {
diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp
index c48644916..c70af7db2 100644
--- a/targets/minecraft/server/MinecraftServer.cpp
+++ b/targets/minecraft/server/MinecraftServer.cpp
@@ -1,58 +1,58 @@
-#include "Minecraft.Client/include/stdafx.h"
+#include "MinecraftServer.h"
 
+#include <chrono>
 #include <ctime>
 #include <thread>
-#include <chrono>
 
 #include "ConsoleInput.h"
-#include "minecraft/server/level/DerivedServerLevel.h"
 #include "DispenserBootstrap.h"
-#include "minecraft/server/level/EntityTracker.h"
-#include "MinecraftServer.h"
-#include "minecraft/client/Options.h"
+#include "Minecraft.Client/include/stdafx.h"
 #include "PlayerList.h"
+#include "Settings.h"
+#include "console_helpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/System.h"
+#include "minecraft/Pos.h"
+#include "minecraft/client/Options.h"
+#include "minecraft/commands/Command.h"
+#include "minecraft/network/net.minecraft.network.h"
+#include "minecraft/server/level/DerivedServerLevel.h"
+#include "minecraft/server/level/EntityTracker.h"
 #include "minecraft/server/level/ServerChunkCache.h"
-#include "minecraft/server/network/ServerConnection.h"
 #include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/server/level/ServerLevelListener.h"
-#include "Settings.h"
-#include "minecraft/commands/Command.h"
+#include "minecraft/server/network/ServerConnection.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/network/net.minecraft.network.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/Pos.h"
-#include "java/System.h"
-#include "console_helpers/StringHelpers.h"
-#include "console_helpers/PlatformTime.h"
 #if defined(SPLIT_SAVES)
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
 #endif
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/client/ProgressRenderer.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "console_helpers/ThreadName.h"
-#include "minecraft/world/level/chunk/CompressedTileStorage.h"
-#include "minecraft/world/level/chunk/SparseLightStorage.h"
-#include "minecraft/world/level/chunk/SparseDataStorage.h"
-#include "console_helpers/compression.h"
-#include "minecraft/world/level/biome/BiomeSource.h"
+#include "4J_Input.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
+#include "console_helpers/ThreadName.h"
+#include "console_helpers/compression.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/ProgressRenderer.h"
+#include "minecraft/client/renderer/GameRenderer.h"
 #include "minecraft/server/commands/ServerCommandDispatcher.h"
 #include "minecraft/server/level/PlayerChunkMap.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "4J_Input.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/level/Level.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
+#include "minecraft/world/level/chunk/CompressedTileStorage.h"
+#include "minecraft/world/level/chunk/SparseDataStorage.h"
+#include "minecraft/world/level/chunk/SparseLightStorage.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
 
diff --git a/targets/minecraft/server/MinecraftServer.h b/targets/minecraft/server/MinecraftServer.h
index 6d52bc2c2..75fdbcda3 100644
--- a/targets/minecraft/server/MinecraftServer.h
+++ b/targets/minecraft/server/MinecraftServer.h
@@ -3,10 +3,10 @@
 #include <mutex>
 
 #include "ConsoleInputSource.h"
-#include "minecraft/SharedConstants.h"
 #include "console_helpers/C4JThread.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class ServerConnection;
 class Settings;
diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp
index 1ec644ed7..34ae44bb1 100644
--- a/targets/minecraft/server/PlayerList.cpp
+++ b/targets/minecraft/server/PlayerList.cpp
@@ -1,37 +1,36 @@
-#include <cstdint>
-#include <cmath>
-
-#include "Minecraft.Client/include/stdafx.h"
-
 #include "PlayerList.h"
-#include "minecraft/server/level/PlayerChunkMap.h"
-#include "MinecraftServer.h"
-#include "Settings.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/level/ServerChunkCache.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/server/level/ServerPlayerGameMode.h"
-#include "minecraft/server/network/ServerConnection.h"
-#include "minecraft/server/network/PendingConnection.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/server/level/EntityTracker.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/network/net.minecraft.network.h"
-#include "minecraft/Pos.h"
-#include "minecraft/util/ProgressListener.h"
-#include "minecraft/world/level/levelgen/HellRandomLevelSource.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h"
-#include "java/JavaMath.h"
-#include "minecraft/world/entity/EntityIO.h"
-#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+
+#include <cmath>
+#include <cstdint>
+
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "MinecraftServer.h"
+#include "Settings.h"
+#include "java/JavaMath.h"
+#include "minecraft/Pos.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "minecraft/network/net.minecraft.network.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/server/level/EntityTracker.h"
+#include "minecraft/server/level/PlayerChunkMap.h"
+#include "minecraft/server/level/ServerChunkCache.h"
+#include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/server/level/ServerPlayerGameMode.h"
+#include "minecraft/server/network/PendingConnection.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/server/network/ServerConnection.h"
+#include "minecraft/util/ProgressListener.h"
+#include "minecraft/world/entity/EntityIO.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
+#include "minecraft/world/level/levelgen/HellRandomLevelSource.h"
+#include "minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
 
 // 4J - this class is fairly substantially altered as there didn't seem any
 // point in porting code for banning, whitelisting, ops etc.
diff --git a/targets/minecraft/server/PlayerList.h b/targets/minecraft/server/PlayerList.h
index ce7eff10d..4ad758022 100644
--- a/targets/minecraft/server/PlayerList.h
+++ b/targets/minecraft/server/PlayerList.h
@@ -1,13 +1,13 @@
 #pragma once
 #include <cstdint>
 #include <deque>
-#include <mutex>
-#include <vector>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
+#include <vector>
 
-#include "nbt/CompoundTag.h"
 #include "4J.Common/4J_Compat.h"
+#include "nbt/CompoundTag.h"
 
 class ServerPlayer;
 class PlayerChunkMap;
diff --git a/targets/minecraft/server/Settings.cpp b/targets/minecraft/server/Settings.cpp
index 64855e841..6599a7edf 100644
--- a/targets/minecraft/server/Settings.cpp
+++ b/targets/minecraft/server/Settings.cpp
@@ -1,4 +1,5 @@
 #include "Settings.h"
+
 #include "console_helpers/StringHelpers.h"
 
 // 4J - TODO - serialise/deserialise from file
diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp
index 5e93557ac..503747327 100644
--- a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp
+++ b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp
@@ -1,11 +1,9 @@
+#include "ServerCommandDispatcher.h"
+
 #include <memory>
 #include <vector>
 
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/level/ServerPlayer.h"
 #include "TeleportCommand.h"
-#include "ServerCommandDispatcher.h"
 #include "minecraft/commands/Command.h"
 #include "minecraft/commands/CommandSender.h"
 #include "minecraft/commands/common/DefaultGameModeCommand.h"
@@ -16,6 +14,9 @@
 #include "minecraft/commands/common/KillCommand.h"
 #include "minecraft/commands/common/TimeCommand.h"
 #include "minecraft/commands/common/ToggleDownfallCommand.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
 
 ServerCommandDispatcher::ServerCommandDispatcher() {
     addCommand(new TimeCommand());
diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.h b/targets/minecraft/server/commands/ServerCommandDispatcher.h
index 333ca64df..2027c7b5a 100644
--- a/targets/minecraft/server/commands/ServerCommandDispatcher.h
+++ b/targets/minecraft/server/commands/ServerCommandDispatcher.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "minecraft/commands/CommandDispatcher.h"
 #include "minecraft/commands/AdminLogCommand.h"
+#include "minecraft/commands/CommandDispatcher.h"
 #include "minecraft/network/packet/ChatPacket.h"
 
 class ServerCommandDispatcher : public CommandDispatcher,
diff --git a/targets/minecraft/server/commands/TeleportCommand.cpp b/targets/minecraft/server/commands/TeleportCommand.cpp
index efaf2f7b5..2dcf44f3b 100644
--- a/targets/minecraft/server/commands/TeleportCommand.cpp
+++ b/targets/minecraft/server/commands/TeleportCommand.cpp
@@ -1,18 +1,19 @@
+#include "TeleportCommand.h"
+
 #include <string>
 
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "TeleportCommand.h"
-#include "minecraft/network/packet/ChatPacket.h"
-#include "minecraft/world/level/Level.h"
-#include "minecraft/world/level/dimension/Dimension.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/network/packet/ChatPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 
 EGameCommand TeleportCommand::getId() { return eGameCommand_Teleport; }
 
diff --git a/targets/minecraft/server/commands/TeleportCommand.h b/targets/minecraft/server/commands/TeleportCommand.h
index bad65ea22..43c8592f3 100644
--- a/targets/minecraft/server/commands/TeleportCommand.h
+++ b/targets/minecraft/server/commands/TeleportCommand.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
-#include "minecraft/commands/Command.h"
 #include "4J.Common/4J_Compat.h"
+#include "minecraft/commands/Command.h"
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/network/packet/GameCommandPacket.h"
 
diff --git a/targets/minecraft/server/level/CreativeMode.cpp b/targets/minecraft/server/level/CreativeMode.cpp
index 0ddc3d0d8..bb790202d 100644
--- a/targets/minecraft/server/level/CreativeMode.cpp
+++ b/targets/minecraft/server/level/CreativeMode.cpp
@@ -1,10 +1,11 @@
 
 #include "CreativeMode.h"
+
 #include "minecraft/client/User.h"
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
diff --git a/targets/minecraft/server/level/DemoMode.cpp b/targets/minecraft/server/level/DemoMode.cpp
index 7b20ba63a..fc0ddf008 100644
--- a/targets/minecraft/server/level/DemoMode.cpp
+++ b/targets/minecraft/server/level/DemoMode.cpp
@@ -1,5 +1,6 @@
 
 #include "DemoMode.h"
+
 #include "minecraft/world/level/net.minecraft.world.level.h"
 
 DemoMode::DemoMode(Minecraft* minecraft) : SurvivalMode(minecraft) {
diff --git a/targets/minecraft/server/level/DerivedServerLevel.cpp b/targets/minecraft/server/level/DerivedServerLevel.cpp
index 13d73eebb..5ad1de97f 100644
--- a/targets/minecraft/server/level/DerivedServerLevel.cpp
+++ b/targets/minecraft/server/level/DerivedServerLevel.cpp
@@ -1,7 +1,8 @@
 #include "DerivedServerLevel.h"
-#include "minecraft/world/level/storage/SavedDataStorage.h"
-#include "minecraft/world/level/storage/DerivedLevelData.h"
+
 #include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/world/level/storage/DerivedLevelData.h"
+#include "minecraft/world/level/storage/SavedDataStorage.h"
 
 class LevelSettings;
 class LevelStorage;
diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp
index 60a3de803..648b33e23 100644
--- a/targets/minecraft/server/level/EntityTracker.cpp
+++ b/targets/minecraft/server/level/EntityTracker.cpp
@@ -1,25 +1,26 @@
+#include "EntityTracker.h"
+
 #include <unordered_set>
 
-#include "EntityTracker.h"
+#include "ServerLevel.h"
+#include "ServerPlayer.h"
+#include "TrackedEntity.h"
+#include "minecraft/network/net.minecraft.network.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/PlayerList.h"
-#include "TrackedEntity.h"
-#include "ServerPlayer.h"
-#include "ServerLevel.h"
+#include "minecraft/server/network/PlayerConnection.h"
 #include "minecraft/util/Mth.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
 #include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/network/net.minecraft.network.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
 #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
 
 EntityTracker::EntityTracker(ServerLevel* level) {
     this->level = level;
diff --git a/targets/minecraft/server/level/EntityTracker.h b/targets/minecraft/server/level/EntityTracker.h
index 5c6c1564b..3fd74cb08 100644
--- a/targets/minecraft/server/level/EntityTracker.h
+++ b/targets/minecraft/server/level/EntityTracker.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+
 #include "console_helpers/HashExtension.h"
 #include "java/JavaIntHash.h"
 
-#include <unordered_set>
-#include <unordered_map>
-#include <memory>
-
 class Entity;
 class ServerLevel;
 class ServerPlayer;
diff --git a/targets/minecraft/server/level/GameMode.cpp b/targets/minecraft/server/level/GameMode.cpp
index 388ad1410..3791be7e4 100644
--- a/targets/minecraft/server/level/GameMode.cpp
+++ b/targets/minecraft/server/level/GameMode.cpp
@@ -1,14 +1,15 @@
 
 #include "GameMode.h"
+
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 
 GameMode::GameMode(Minecraft* minecraft) {
     instaBuild = false;  // 4J - added
diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp
index baf4514c6..1d06c6e35 100644
--- a/targets/minecraft/server/level/PlayerChunkMap.cpp
+++ b/targets/minecraft/server/level/PlayerChunkMap.cpp
@@ -1,4 +1,7 @@
+#include "PlayerChunkMap.h"
+
 #include <assert.h>
+
 #include <algorithm>
 #include <compare>
 #include <format>
@@ -6,22 +9,21 @@
 #include <unordered_set>
 #include <utility>
 
-#include "PlayerChunkMap.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "ServerLevel.h"
-#include "ServerChunkCache.h"
-#include "ServerPlayer.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "ServerChunkCache.h"
+#include "ServerLevel.h"
+#include "ServerPlayer.h"
 #include "minecraft/network/packet/BlockRegionUpdatePacket.h"
 #include "minecraft/network/packet/ChunkTilesUpdatePacket.h"
 #include "minecraft/network/packet/ChunkVisibilityAreaPacket.h"
 #include "minecraft/network/packet/ChunkVisibilityPacket.h"
 #include "minecraft/network/packet/Packet.h"
 #include "minecraft/network/packet/TileUpdatePacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/network/PlayerConnection.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
diff --git a/targets/minecraft/server/level/PlayerChunkMap.h b/targets/minecraft/server/level/PlayerChunkMap.h
index fbf135e76..c74b12912 100644
--- a/targets/minecraft/server/level/PlayerChunkMap.h
+++ b/targets/minecraft/server/level/PlayerChunkMap.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 #include <unordered_map>
 #include <vector>
diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp
index 7112b826c..2fd92b7e8 100644
--- a/targets/minecraft/server/level/ServerChunkCache.cpp
+++ b/targets/minecraft/server/level/ServerChunkCache.cpp
@@ -1,25 +1,27 @@
+#include "ServerChunkCache.h"
+
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
+
 #include <algorithm>
 
-#include "ServerChunkCache.h"
-#include "ServerLevel.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/util/ProgressListener.h"
-#include "console_helpers/compression.h"
-#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
-#include "minecraft/world/level/tile/Tile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "ServerLevel.h"
+#include "console_helpers/compression.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/util/ProgressListener.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/EmptyLevelChunk.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/chunk/storage/ChunkStorage.h"
+#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage,
                                    ChunkSource* source) {
diff --git a/targets/minecraft/server/level/ServerChunkCache.h b/targets/minecraft/server/level/ServerChunkCache.h
index 0e3425b2b..ae0ea79fd 100644
--- a/targets/minecraft/server/level/ServerChunkCache.h
+++ b/targets/minecraft/server/level/ServerChunkCache.h
@@ -1,18 +1,18 @@
 #pragma once
-#include <mutex>
 #include <deque>
 #include <format>
+#include <mutex>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "java/File.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "java/JavaIntHash.h"
-#include "minecraft/world/level/levelgen/RandomLevelSource.h"
 #include "console_helpers/C4JThread.h"
+#include "java/File.h"
+#include "java/JavaIntHash.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/levelgen/RandomLevelSource.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
 
 class ServerLevel;
 class ChunkStorage;
diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp
index 6dacdc6a0..2e849bf09 100644
--- a/targets/minecraft/server/level/ServerLevel.cpp
+++ b/targets/minecraft/server/level/ServerLevel.cpp
@@ -1,55 +1,55 @@
-#include <thread>
+#include "ServerLevel.h"
+
 #include <chrono>
 #include <mutex>
+#include <thread>
 
-#include "Minecraft.Client/include/stdafx.h"
-
-#include "ServerLevel.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "ServerChunkCache.h"
-#include "minecraft/server/PlayerList.h"
-#include "ServerPlayer.h"
-#include "minecraft/server/network/PlayerConnection.h"
+#include "4J_Input.h"
 #include "EntityTracker.h"
+#include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "Minecraft.Client/include/stdafx.h"
+#include "PlayerChunkMap.h"
+#include "ServerChunkCache.h"
+#include "ServerLevelListener.h"
+#include "ServerPlayer.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/skins/DLCTexturePack.h"
+#include "minecraft/client/skins/TexturePackRepository.h"
+#include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
 #include "minecraft/server/ServerScoreboard.h"
-#include "minecraft/world/scores/ScoreboardSaveData.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/util/ProgressListener.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h"
 #include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
+#include "minecraft/world/entity/item/FallingTile.h"
+#include "minecraft/world/entity/item/ItemEntity.h"
+#include "minecraft/world/entity/item/PrimedTnt.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/entity/projectile/Arrow.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
 #include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
 #include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h"
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/scores/ScoreboardSaveData.h"
 #include "minecraft/world/scores/net.minecraft.world.scores.h"
-#include "minecraft/world/entity/item/ItemEntity.h"
-#include "minecraft/world/entity/projectile/Arrow.h"
-#include "minecraft/world/entity/item/PrimedTnt.h"
-#include "minecraft/world/entity/item/FallingTile.h"
-#include "minecraft/network/packet/net.minecraft.network.packet.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
-#include "ServerLevelListener.h"
-#include "minecraft/util/WeighedTreasure.h"
-#include "minecraft/client/skins/TexturePackRepository.h"
-#include "minecraft/client/skins/DLCTexturePack.h"
-#include "minecraft/util/ProgressListener.h"
-#include "Minecraft.Client/Common/ShutdownManager.h"
-#include "minecraft/client/Minecraft.h"
-#include "PlayerChunkMap.h"
-#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-#include "4J_Input.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 
 std::vector<WeighedTreasure*> ServerLevel::RANDOM_BONUS_ITEMS;
 
diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h
index 18655047c..286d26ce5 100644
--- a/targets/minecraft/server/level/ServerLevel.h
+++ b/targets/minecraft/server/level/ServerLevel.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <list>
-#include <set>
 #include <mutex>
-#include "minecraft/world/level/net.minecraft.world.level.h"
+#include <set>
+
 #include "java/JavaIntHash.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 
 class ServerChunkCache;
 class MinecraftServer;
diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp
index 89bc5bd6a..667515baf 100644
--- a/targets/minecraft/server/level/ServerLevelListener.cpp
+++ b/targets/minecraft/server/level/ServerLevelListener.cpp
@@ -1,18 +1,19 @@
+#include "ServerLevelListener.h"
+
 #include <memory>
 #include <vector>
 
-#include "ServerLevelListener.h"
 #include "EntityTracker.h"
-#include "minecraft/server/MinecraftServer.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "PlayerChunkMap.h"
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
-#include "minecraft/server/PlayerList.h"
-#include "PlayerChunkMap.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/network/packet/LevelEventPacket.h"
 #include "minecraft/network/packet/LevelSoundPacket.h"
 #include "minecraft/network/packet/TileDestructionPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/network/PlayerConnection.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 
diff --git a/targets/minecraft/server/level/ServerLevelListener.h b/targets/minecraft/server/level/ServerLevelListener.h
index f51e01f6f..4f30d5c8b 100644
--- a/targets/minecraft/server/level/ServerLevelListener.h
+++ b/targets/minecraft/server/level/ServerLevelListener.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <string>
 
-#include "minecraft/world/level/LevelListener.h"
 #include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/level/LevelListener.h"
 
 class Player;
 class TileEntity;
diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp
index 64c5e9320..0c4ccb99f 100644
--- a/targets/minecraft/server/level/ServerPlayer.cpp
+++ b/targets/minecraft/server/level/ServerPlayer.cpp
@@ -1,44 +1,41 @@
+#include "ServerPlayer.h"
+
 #include <cfloat>
 #include <cmath>
 
-#include "ServerPlayer.h"
-#include "ServerPlayerGameMode.h"
-#include "ServerLevel.h"
-#include "minecraft/server/MinecraftServer.h"
+#include "4J_Input.h"
 #include "EntityTracker.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/server/Settings.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-
+#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
+#include "ServerLevel.h"
+#include "ServerPlayerGameMode.h"
+#include "java/Random.h"
+#include "minecraft/Pos.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/locale/net.minecraft.locale.h"
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/Settings.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 #include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/scores/net.minecraft.world.scores.h"
-#include "minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/locale/net.minecraft.locale.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
-
-#include "4J_Input.h"
-
-#include "minecraft/Pos.h"
-#include "java/Random.h"
-
 #include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/scores/criteria/net.minecraft.world.scores.criteria.h"
+#include "minecraft/world/scores/net.minecraft.world.scores.h"
 
 ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level,
                            const std::wstring& name,
diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.cpp b/targets/minecraft/server/level/ServerPlayerGameMode.cpp
index 19fc5ba94..e0d19a6c6 100644
--- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp
+++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp
@@ -1,13 +1,15 @@
+#include "ServerPlayerGameMode.h"
+
 #include <vector>
 
-#include "ServerPlayerGameMode.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
-#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/client/renderer/LevelRenderer.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
 #include "minecraft/network/packet/TileUpdatePacket.h"
+#include "minecraft/server/network/PlayerConnection.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
@@ -19,7 +21,6 @@
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/client/Minecraft.h"
 
 ServerPlayerGameMode::ServerPlayerGameMode(Level* level) {
     // 4J - added initialisers
diff --git a/targets/minecraft/server/level/SurvivalMode.cpp b/targets/minecraft/server/level/SurvivalMode.cpp
index 187b0882f..780c30e41 100644
--- a/targets/minecraft/server/level/SurvivalMode.cpp
+++ b/targets/minecraft/server/level/SurvivalMode.cpp
@@ -1,13 +1,14 @@
 
 #include "SurvivalMode.h"
+
 #include "DemoMode.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/client/ClientConstants.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/client/ClientConstants.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 SurvivalMode::SurvivalMode(Minecraft* minecraft) : GameMode(minecraft) {
     // 4J - added initialisers
diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp
index 8cd885fce..83df78c68 100644
--- a/targets/minecraft/server/level/TrackedEntity.cpp
+++ b/targets/minecraft/server/level/TrackedEntity.cpp
@@ -1,20 +1,22 @@
+#include "TrackedEntity.h"
+
 #include <assert.h>
 #include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <string>
 #include <vector>
 
-#include "TrackedEntity.h"
-#include "ServerPlayer.h"
-#include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
-#include "EntityTracker.h"
 #include "4J.Common/4J_Compat.h"
+#include "EntityTracker.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "ServerPlayer.h"
+#include "java/Class.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/network/packet/AddEntityPacket.h"
 #include "minecraft/network/packet/AddExperienceOrbPacket.h"
@@ -33,6 +35,10 @@
 #include "minecraft/network/packet/TeleportEntityPacket.h"
 #include "minecraft/network/packet/UpdateAttributesPacket.h"
 #include "minecraft/network/packet/UpdateMobEffectPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/network/PlayerConnection.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Creature.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ExperienceOrb.h"
@@ -53,10 +59,6 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/level/saveddata/MapItemSavedData.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Class.h"
 
 class AttributeInstance;
 class MobEffectInstance;
diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp
index 9ec7c5e8b..3134bd5c1 100644
--- a/targets/minecraft/server/network/PendingConnection.cpp
+++ b/targets/minecraft/server/network/PendingConnection.cpp
@@ -1,28 +1,30 @@
+#include "PendingConnection.h"
+
 #include <stdio.h>
+
 #include <cstdint>
 #include <vector>
 
-#include "PendingConnection.h"
-#include "PlayerConnection.h"
-#include "ServerConnection.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/SharedConstants.h"
 #include "4J.Common/4J_Compat.h"
 #include "4J_Storage.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "PlayerConnection.h"
+#include "ServerConnection.h"
+#include "java/Random.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/LoginPacket.h"
 #include "minecraft/network/packet/PreLoginPacket.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
-#include "java/Random.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerPlayer.h"
 
 class Packet;
 // #if 0
diff --git a/targets/minecraft/server/network/PendingConnection.h b/targets/minecraft/server/network/PendingConnection.h
index cb2b2d4cc..cf1524b0f 100644
--- a/targets/minecraft/server/network/PendingConnection.h
+++ b/targets/minecraft/server/network/PendingConnection.h
@@ -2,8 +2,8 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/network/packet/PacketListener.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/network/packet/PacketListener.h"
 
 class MinecraftServer;
 class Socket;
diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp
index 022984d1e..1e23f378e 100644
--- a/targets/minecraft/server/network/PlayerConnection.cpp
+++ b/targets/minecraft/server/network/PlayerConnection.cpp
@@ -1,30 +1,33 @@
+#include "PlayerConnection.h"
+
 #include <wchar.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <format>
 #include <utility>
 
-#include "PlayerConnection.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/level/ServerPlayerGameMode.h"
-#include "minecraft/server/PlayerList.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/world/phys/AABB.h"
-#include "minecraft/SharedConstants.h"
-#include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "ServerConnection.h"
-#include "minecraft/stats/GenericStats.h"
-#include "java/JavaMath.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
+#include "Minecraft.Client/Common/src/Network/Socket.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "ServerConnection.h"
+#include "java/Class.h"
+#include "java/InputOutputStream/ByteArrayInputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/JavaMath.h"
+#include "java/Random.h"
+#include "java/System.h"
 #include "minecraft/Facing.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/commands/CommandDispatcher.h"
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/network/Connection.h"
@@ -61,6 +64,12 @@
 #include "minecraft/network/packet/TileUpdatePacket.h"
 #include "minecraft/network/packet/TradeItemPacket.h"
 #include "minecraft/network/packet/UseItemPacket.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/server/level/ServerPlayer.h"
+#include "minecraft/server/level/ServerPlayerGameMode.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
@@ -92,15 +101,7 @@
 #include "minecraft/world/level/tile/entity/CommandBlockEntity.h"
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
-#include "java/Class.h"
-#include "java/InputOutputStream/ByteArrayInputStream.h"
-#include "java/InputOutputStream/DataInputStream.h"
-#include "java/Random.h"
-#include "java/System.h"
+#include "minecraft/world/phys/AABB.h"
 
 class SavedData;
 
diff --git a/targets/minecraft/server/network/PlayerConnection.h b/targets/minecraft/server/network/PlayerConnection.h
index 755e46497..07e140654 100644
--- a/targets/minecraft/server/network/PlayerConnection.h
+++ b/targets/minecraft/server/network/PlayerConnection.h
@@ -1,16 +1,17 @@
 #pragma once
 #include <stdint.h>
-#include <mutex>
+
 #include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "minecraft/server/ConsoleInputSource.h"
-#include "minecraft/network/packet/PacketListener.h"
-#include "java/JavaIntHash.h"
 #include "4J.Common/4J_Compat.h"
+#include "java/JavaIntHash.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
+#include "minecraft/network/packet/PacketListener.h"
+#include "minecraft/server/ConsoleInputSource.h"
 
 class MinecraftServer;
 class Connection;
diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp
index 243e5af34..1acd8de8b 100644
--- a/targets/minecraft/server/network/ServerConnection.cpp
+++ b/targets/minecraft/server/network/ServerConnection.cpp
@@ -1,16 +1,17 @@
+#include "ServerConnection.h"
+
 #include <algorithm>
 
-#include "ServerConnection.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "PendingConnection.h"
 #include "PlayerConnection.h"
-#include "minecraft/server/level/ServerPlayer.h"
-#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "console_helpers/StringHelpers.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "minecraft/network/Connection.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/network/packet/ServerSettingsChangedPacket.h"
-#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/level/ServerPlayer.h"
 
 ServerConnection::ServerConnection(MinecraftServer* server) {
     // 4J - added initialiser
diff --git a/targets/minecraft/server/network/ServerConnection.h b/targets/minecraft/server/network/ServerConnection.h
index 69bf97ba4..1a9e73509 100644
--- a/targets/minecraft/server/network/ServerConnection.h
+++ b/targets/minecraft/server/network/ServerConnection.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <mutex>
 #include <format>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
diff --git a/targets/minecraft/stats/Achievement.cpp b/targets/minecraft/stats/Achievement.cpp
index 88bf96cca..6643d2e1f 100644
--- a/targets/minecraft/stats/Achievement.cpp
+++ b/targets/minecraft/stats/Achievement.cpp
@@ -1,8 +1,9 @@
+#include "Achievement.h"
+
 #include <vector>
 
 #include "Achievements.h"
 #include "DescFormatter.h"
-#include "Achievement.h"
 #include "minecraft/locale/I18n.h"
 #include "minecraft/stats/Stat.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/stats/Achievements.cpp b/targets/minecraft/stats/Achievements.cpp
index be1c4a71a..073b9e2e6 100644
--- a/targets/minecraft/stats/Achievements.cpp
+++ b/targets/minecraft/stats/Achievements.cpp
@@ -1,9 +1,10 @@
+#include "Achievements.h"
+
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "Achievement.h"
-#include "Achievements.h"
 #include "Minecraft.Client/Common/src/Console_Awards_enum.h"
 #include "minecraft/world/item/BowItem.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/stats/CommonStats.cpp b/targets/minecraft/stats/CommonStats.cpp
index 4df58dea4..b2e791216 100644
--- a/targets/minecraft/stats/CommonStats.cpp
+++ b/targets/minecraft/stats/CommonStats.cpp
@@ -1,11 +1,12 @@
+#include "CommonStats.h"
+
 #include <string.h>
 
 #include "Achievements.h"
-#include "minecraft/world/item/Item.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "CommonStats.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/stats/Stats.h"
+#include "minecraft/world/item/Item.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 Stat* CommonStats::get_stat(int i) { return Stats::get(i); }
 
diff --git a/targets/minecraft/stats/CommonStats.h b/targets/minecraft/stats/CommonStats.h
index 41adbb343..8bb2d0e88 100644
--- a/targets/minecraft/stats/CommonStats.h
+++ b/targets/minecraft/stats/CommonStats.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
diff --git a/targets/minecraft/stats/DurangoStats.h b/targets/minecraft/stats/DurangoStats.h
index 855abc784..b911c2fd3 100644
--- a/targets/minecraft/stats/DurangoStats.h
+++ b/targets/minecraft/stats/DurangoStats.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "GeneralStat.h"
-
 #include "GenericStats.h"
 
 enum ELeaderboardId {
diff --git a/targets/minecraft/stats/GeneralStat.cpp b/targets/minecraft/stats/GeneralStat.cpp
index abb853207..76bf3edfb 100644
--- a/targets/minecraft/stats/GeneralStat.cpp
+++ b/targets/minecraft/stats/GeneralStat.cpp
@@ -1,6 +1,7 @@
+#include "GeneralStat.h"
+
 #include <vector>
 
-#include "GeneralStat.h"
 #include "minecraft/stats/Stat.h"
 #include "minecraft/stats/Stats.h"
 
diff --git a/targets/minecraft/stats/GenericStats.h b/targets/minecraft/stats/GenericStats.h
index f606ceef6..19041b3d6 100644
--- a/targets/minecraft/stats/GenericStats.h
+++ b/targets/minecraft/stats/GenericStats.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <vector>
 
+#include "Minecraft.Client/Common/src/Console_Awards_enum.h"
 #include "Stat.h"
 #include "Stats.h"
-#include "Minecraft.Client/Common/src/Console_Awards_enum.h"
 #include "java/Class.h"
 
 class DamageSource;
diff --git a/targets/minecraft/stats/ItemStat.cpp b/targets/minecraft/stats/ItemStat.cpp
index 5aef42ca4..e07847ca3 100644
--- a/targets/minecraft/stats/ItemStat.cpp
+++ b/targets/minecraft/stats/ItemStat.cpp
@@ -1,4 +1,5 @@
 #include "ItemStat.h"
+
 #include "minecraft/stats/Stat.h"
 
 ItemStat::ItemStat(int id, const std::wstring& name, int itemId)
diff --git a/targets/minecraft/stats/Stat.cpp b/targets/minecraft/stats/Stat.cpp
index f85786674..515e5f6bb 100644
--- a/targets/minecraft/stats/Stat.cpp
+++ b/targets/minecraft/stats/Stat.cpp
@@ -1,11 +1,12 @@
-#include <utility>
+#include "Stat.h"
+
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "NumberFormatters.h"
 #include "StatFormatter.h"
 #include "Stats.h"
-#include "Stat.h"
 #include "console_helpers/StringHelpers.h"
 
 Stat::DefaultFormat* Stat::defaultFormatter = new DefaultFormat();
diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h
index 7be68322a..5af20b07e 100644
--- a/targets/minecraft/stats/Stat.h
+++ b/targets/minecraft/stats/Stat.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
 
-#include "StatFormatter.h"
 #include "GenericStats.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "StatFormatter.h"
 
 class DecimalFormat;
 class LocalPlayer;
diff --git a/targets/minecraft/stats/Stats.cpp b/targets/minecraft/stats/Stats.cpp
index 6c31e9c61..a93ab6ae4 100644
--- a/targets/minecraft/stats/Stats.cpp
+++ b/targets/minecraft/stats/Stats.cpp
@@ -1,13 +1,14 @@
+#include "Stats.h"
+
 #include <string>
 #include <vector>
 
 #include "Achievements.h"
-#include "ItemStat.h"
 #include "GeneralStat.h"
-#include "Stats.h"
-#include "minecraft/stats/StatsCounter.h"
+#include "ItemStat.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/stats/Stat.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/world/item/FishingRodItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/MapItem.h"
diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp
index 3ee21d97b..06527f2dc 100644
--- a/targets/minecraft/stats/StatsCounter.cpp
+++ b/targets/minecraft/stats/StatsCounter.cpp
@@ -1,21 +1,24 @@
+#include "StatsCounter.h"
+
 #include <assert.h>
 #include <limits.h>
-#include <cstring>
+
 #include <cstdint>
+#include <cstring>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "StatsCounter.h"
-#include "minecraft/stats/Stat.h"
-#include "minecraft/stats/Stats.h"
+#include "4J_Profile.h"
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/App_structs.h"
+#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/stats/Achievement.h"
 #include "minecraft/stats/Achievements.h"
-#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
-#include "4J_Profile.h"
-#include "Minecraft.Client/Common/App_structs.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/stats/GenericStats.h"
+#include "minecraft/stats/Stat.h"
+#include "minecraft/stats/Stats.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp
index 0ff263299..89070b845 100644
--- a/targets/minecraft/util/HtmlString.cpp
+++ b/targets/minecraft/util/HtmlString.cpp
@@ -1,10 +1,11 @@
+#include "HtmlString.h"
+
 #include <iomanip>
 #include <sstream>
 #include <vector>
 
-#include "HtmlString.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 
 HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor,
                        bool italics, bool indent) {
diff --git a/targets/minecraft/util/Mth.cpp b/targets/minecraft/util/Mth.cpp
index 8f8967d83..1efc5fa4f 100644
--- a/targets/minecraft/util/Mth.cpp
+++ b/targets/minecraft/util/Mth.cpp
@@ -1,6 +1,9 @@
+#include "minecraft/util/Mth.h"
+
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
+
 #include <array>
 #include <numbers>
 #include <sstream>
@@ -8,7 +11,6 @@
 
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
-#include "minecraft/util/Mth.h"
 
 constexpr size_t SIN_TAB_CNT = 65536;
 constexpr float SIN_SCALE = SIN_TAB_CNT / (std::numbers::pi_v<float> * 2.0f);
diff --git a/targets/minecraft/util/Mth.h b/targets/minecraft/util/Mth.h
index 32363dd44..9053758b3 100644
--- a/targets/minecraft/util/Mth.h
+++ b/targets/minecraft/util/Mth.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 #include <string>
 
 class Random;
diff --git a/targets/minecraft/util/WeighedRandom.cpp b/targets/minecraft/util/WeighedRandom.cpp
index 4ab9f071a..d6a72d53f 100644
--- a/targets/minecraft/util/WeighedRandom.cpp
+++ b/targets/minecraft/util/WeighedRandom.cpp
@@ -1,8 +1,9 @@
 
+#include "minecraft/util/WeighedRandom.h"
+
 #include <format>
 #include <vector>
 
-#include "minecraft/util/WeighedRandom.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/Random.h"
 #include "minecraft/util/WeighedRandom.h"
diff --git a/targets/minecraft/util/WeighedTreasure.cpp b/targets/minecraft/util/WeighedTreasure.cpp
index f2debd5e1..3f9dff7ef 100644
--- a/targets/minecraft/util/WeighedTreasure.cpp
+++ b/targets/minecraft/util/WeighedTreasure.cpp
@@ -1,4 +1,5 @@
 #include "WeighedTreasure.h"
+
 #include "java/Random.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/CompoundContainer.cpp b/targets/minecraft/world/CompoundContainer.cpp
index b16916983..bcdbf0be0 100644
--- a/targets/minecraft/world/CompoundContainer.cpp
+++ b/targets/minecraft/world/CompoundContainer.cpp
@@ -1,6 +1,7 @@
-#include "minecraft/network/packet/ContainerOpenPacket.h"
 #include "CompoundContainer.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/network/packet/ContainerOpenPacket.h"
 
 CompoundContainer::CompoundContainer(int name, std::shared_ptr<Container> c1,
                                      std::shared_ptr<Container> c2) {
diff --git a/targets/minecraft/world/Container.h b/targets/minecraft/world/Container.h
index 307853445..c4cc51711 100644
--- a/targets/minecraft/world/Container.h
+++ b/targets/minecraft/world/Container.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 class ItemInstance;
 class Player;
diff --git a/targets/minecraft/world/FlippedIcon.cpp b/targets/minecraft/world/FlippedIcon.cpp
index 16948c9c8..d4c24ff1f 100644
--- a/targets/minecraft/world/FlippedIcon.cpp
+++ b/targets/minecraft/world/FlippedIcon.cpp
@@ -1,4 +1,5 @@
 #include "FlippedIcon.h"
+
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/Icon.h"
 
diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp
index 85a8b6bfd..fc5975f14 100644
--- a/targets/minecraft/world/SimpleContainer.cpp
+++ b/targets/minecraft/world/SimpleContainer.cpp
@@ -1,9 +1,10 @@
+#include "SimpleContainer.h"
+
 #include <vector>
 
-#include "net.minecraft.world.ContainerListener.h"
-#include "SimpleContainer.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "net.minecraft.world.ContainerListener.h"
 
 SimpleContainer::SimpleContainer(int name, std::wstring stringName,
                                  bool customName, int size) {
diff --git a/targets/minecraft/world/SimpleContainer.h b/targets/minecraft/world/SimpleContainer.h
index 9b1d91a0f..50f042cfc 100644
--- a/targets/minecraft/world/SimpleContainer.h
+++ b/targets/minecraft/world/SimpleContainer.h
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "Container.h"
-#include "net.minecraft.world.ContainerListener.h"
 #include "minecraft/world/Container.h"
+#include "net.minecraft.world.ContainerListener.h"
 
 class ItemInstance;
 namespace net_minecraft_world {
diff --git a/targets/minecraft/world/damageSource/CombatEntry.cpp b/targets/minecraft/world/damageSource/CombatEntry.cpp
index a30b284b5..68d7581ce 100644
--- a/targets/minecraft/world/damageSource/CombatEntry.cpp
+++ b/targets/minecraft/world/damageSource/CombatEntry.cpp
@@ -1,7 +1,8 @@
+#include "CombatEntry.h"
+
 #include <limits>
 #include <memory>
 
-#include "CombatEntry.h"
 #include "java/Class.h"
 #include "minecraft/world/damageSource/CombatTracker.h"
 #include "minecraft/world/damageSource/DamageSource.h"
diff --git a/targets/minecraft/world/damageSource/CombatTracker.cpp b/targets/minecraft/world/damageSource/CombatTracker.cpp
index a67389c65..9970b7c3b 100644
--- a/targets/minecraft/world/damageSource/CombatTracker.cpp
+++ b/targets/minecraft/world/damageSource/CombatTracker.cpp
@@ -1,6 +1,7 @@
+#include "CombatTracker.h"
+
 #include <string>
 
-#include "CombatTracker.h"
 #include "java/Class.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/damageSource/CombatTracker.h b/targets/minecraft/world/damageSource/CombatTracker.h
index e087d904c..b79c1879b 100644
--- a/targets/minecraft/world/damageSource/CombatTracker.h
+++ b/targets/minecraft/world/damageSource/CombatTracker.h
@@ -3,7 +3,6 @@
 #include <memory>
 #include <vector>
 
-#include "minecraft/SharedConstants.h"
 #include "minecraft/SharedConstants.h"
 
 class CombatEntry;
diff --git a/targets/minecraft/world/damageSource/DamageSource.cpp b/targets/minecraft/world/damageSource/DamageSource.cpp
index cdbeb7e34..44e9d4e24 100644
--- a/targets/minecraft/world/damageSource/DamageSource.cpp
+++ b/targets/minecraft/world/damageSource/DamageSource.cpp
@@ -1,9 +1,10 @@
 
+#include "minecraft/world/damageSource/DamageSource.h"
+
 #include <memory>
 #include <string>
 
 #include "minecraft/network/packet/ChatPacket.h"
-#include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
 #include "minecraft/world/damageSource/IndirectEntityDamageSource.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/damageSource/EntityDamageSource.cpp b/targets/minecraft/world/damageSource/EntityDamageSource.cpp
index ed62be972..aab3291e8 100644
--- a/targets/minecraft/world/damageSource/EntityDamageSource.cpp
+++ b/targets/minecraft/world/damageSource/EntityDamageSource.cpp
@@ -1,13 +1,14 @@
 
 // EntityDamageSource::EntityDamageSource(const wstring &msgId,
 // shared_ptr<Entity> entity) : DamageSource(msgId)
+#include "minecraft/world/damageSource/EntityDamageSource.h"
+
 #include <memory>
 #include <string>
 
 #include "java/Class.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/world/damageSource/DamageSource.h"
-#include "minecraft/world/damageSource/EntityDamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp
index f3e639002..d6def2995 100644
--- a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp
+++ b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp
@@ -2,13 +2,14 @@
 // IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId,
 // shared_ptr<Entity> entity, shared_ptr<Entity> owner) :
 // EntityDamageSource(msgId, entity)
+#include "minecraft/world/damageSource/IndirectEntityDamageSource.h"
+
 #include <memory>
 #include <string>
 
 #include "java/Class.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
-#include "minecraft/world/damageSource/IndirectEntityDamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/effect/AbsoptionMobEffect.cpp b/targets/minecraft/world/effect/AbsoptionMobEffect.cpp
index 9d9a8db5d..c301110e0 100644
--- a/targets/minecraft/world/effect/AbsoptionMobEffect.cpp
+++ b/targets/minecraft/world/effect/AbsoptionMobEffect.cpp
@@ -1,6 +1,7 @@
+#include "AbsoptionMobEffect.h"
+
 #include <memory>
 
-#include "AbsoptionMobEffect.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/entity/LivingEntity.h"
 
diff --git a/targets/minecraft/world/effect/AbsoptionMobEffect.h b/targets/minecraft/world/effect/AbsoptionMobEffect.h
index 62a489d47..7f9bde7b7 100644
--- a/targets/minecraft/world/effect/AbsoptionMobEffect.h
+++ b/targets/minecraft/world/effect/AbsoptionMobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MobEffect.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "MobEffect.h"
 
 class LivingEntity;
 
diff --git a/targets/minecraft/world/effect/AttackDamageMobEffect.cpp b/targets/minecraft/world/effect/AttackDamageMobEffect.cpp
index 8304b3c66..1afd81df7 100644
--- a/targets/minecraft/world/effect/AttackDamageMobEffect.cpp
+++ b/targets/minecraft/world/effect/AttackDamageMobEffect.cpp
@@ -1,4 +1,5 @@
 #include "AttackDamageMobEffect.h"
+
 #include "minecraft/world/effect/MobEffect.h"
 
 AttackDamageMobEffect::AttackDamageMobEffect(int id, bool isHarmful,
diff --git a/targets/minecraft/world/effect/AttackDamageMobEffect.h b/targets/minecraft/world/effect/AttackDamageMobEffect.h
index cba73e474..bcfd7a130 100644
--- a/targets/minecraft/world/effect/AttackDamageMobEffect.h
+++ b/targets/minecraft/world/effect/AttackDamageMobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MobEffect.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "MobEffect.h"
 
 class AttributeModifier;
 
diff --git a/targets/minecraft/world/effect/HealthBoostMobEffect.cpp b/targets/minecraft/world/effect/HealthBoostMobEffect.cpp
index 86c4371ec..baf606b80 100644
--- a/targets/minecraft/world/effect/HealthBoostMobEffect.cpp
+++ b/targets/minecraft/world/effect/HealthBoostMobEffect.cpp
@@ -1,6 +1,7 @@
+#include "HealthBoostMobEffect.h"
+
 #include <memory>
 
-#include "HealthBoostMobEffect.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/entity/LivingEntity.h"
 
diff --git a/targets/minecraft/world/effect/HealthBoostMobEffect.h b/targets/minecraft/world/effect/HealthBoostMobEffect.h
index dd4ddfeb3..b59b0cc11 100644
--- a/targets/minecraft/world/effect/HealthBoostMobEffect.h
+++ b/targets/minecraft/world/effect/HealthBoostMobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MobEffect.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "MobEffect.h"
 
 class LivingEntity;
 class BaseAttributeMap;
diff --git a/targets/minecraft/world/effect/InstantaneousMobEffect.cpp b/targets/minecraft/world/effect/InstantaneousMobEffect.cpp
index 0701477ad..6dd1b292e 100644
--- a/targets/minecraft/world/effect/InstantaneousMobEffect.cpp
+++ b/targets/minecraft/world/effect/InstantaneousMobEffect.cpp
@@ -1,6 +1,7 @@
 
+#include "minecraft/world/effect/InstantaneousMobEffect.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
-#include "minecraft/world/effect/InstantaneousMobEffect.h"
 #include "minecraft/world/effect/MobEffect.h"
 
 InstantenousMobEffect::InstantenousMobEffect(int id, bool isHarmful,
diff --git a/targets/minecraft/world/effect/InstantaneousMobEffect.h b/targets/minecraft/world/effect/InstantaneousMobEffect.h
index 69a9230ce..a4b716b88 100644
--- a/targets/minecraft/world/effect/InstantaneousMobEffect.h
+++ b/targets/minecraft/world/effect/InstantaneousMobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "MobEffect.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "MobEffect.h"
 
 class InstantenousMobEffect : public MobEffect {
 public:
diff --git a/targets/minecraft/world/effect/MobEffect.cpp b/targets/minecraft/world/effect/MobEffect.cpp
index ccf23deed..290079ca3 100644
--- a/targets/minecraft/world/effect/MobEffect.cpp
+++ b/targets/minecraft/world/effect/MobEffect.cpp
@@ -1,12 +1,12 @@
+#include "minecraft/SharedConstants.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/food/net.minecraft.world.food.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "net.minecraft.world.effect.h"
-#include "minecraft/SharedConstants.h"
 
 MobEffect* MobEffect::effects[NUM_EFFECTS];
 
diff --git a/targets/minecraft/world/effect/MobEffect.h b/targets/minecraft/world/effect/MobEffect.h
index fef62150a..bd40d75ab 100644
--- a/targets/minecraft/world/effect/MobEffect.h
+++ b/targets/minecraft/world/effect/MobEffect.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
-#include "Minecraft.Client/Common/App_enums.h"
-
-#include <unordered_map>
 #include <memory>
+#include <unordered_map>
+
+#include "Minecraft.Client/Common/App_enums.h"
+#include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
 
 class Mob;
 class MobEffectInstance;
diff --git a/targets/minecraft/world/effect/MobEffectInstance.cpp b/targets/minecraft/world/effect/MobEffectInstance.cpp
index c21091b25..4d5fb97a1 100644
--- a/targets/minecraft/world/effect/MobEffectInstance.cpp
+++ b/targets/minecraft/world/effect/MobEffectInstance.cpp
@@ -1,12 +1,14 @@
 
+#include "minecraft/world/effect/MobEffectInstance.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/effect/MobEffect.h"
-#include "minecraft/world/effect/MobEffectInstance.h"
+#include "nbt/CompoundTag.h"
 
 class LivingEntity;
 
diff --git a/targets/minecraft/world/effect/net.minecraft.world.effect.h b/targets/minecraft/world/effect/net.minecraft.world.effect.h
index 5a545cddf..eb307dbb8 100644
--- a/targets/minecraft/world/effect/net.minecraft.world.effect.h
+++ b/targets/minecraft/world/effect/net.minecraft.world.effect.h
@@ -3,6 +3,6 @@
 #include "AbsoptionMobEffect.h"
 #include "AttackDamageMobEffect.h"
 #include "HealthBoostMobEffect.h"
-#include "MobEffect.h"
 #include "InstantaneousMobEffect.h"
+#include "MobEffect.h"
 #include "MobEffectInstance.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/AgeableMob.cpp b/targets/minecraft/world/entity/AgeableMob.cpp
index 8ed46ac65..81736ece5 100644
--- a/targets/minecraft/world/entity/AgeableMob.cpp
+++ b/targets/minecraft/world/entity/AgeableMob.cpp
@@ -1,9 +1,9 @@
+#include "AgeableMob.h"
+
 #include <string>
 
 #include "SyncedEntityData.h"
-#include "AgeableMob.h"
 #include "java/Class.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/PathfinderMob.h"
@@ -14,6 +14,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/SpawnEggItem.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 class Entity;
 
diff --git a/targets/minecraft/world/entity/DelayedRelease.cpp b/targets/minecraft/world/entity/DelayedRelease.cpp
index 5f87d7201..555f3ea5b 100644
--- a/targets/minecraft/world/entity/DelayedRelease.cpp
+++ b/targets/minecraft/world/entity/DelayedRelease.cpp
@@ -1,4 +1,5 @@
 #include "DelayedRelease.h"
+
 #include "minecraft/world/level/Level.h"
 
 DelayedRelease::DelayedRelease(Level* level, std::shared_ptr<Entity> toRelease,
diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp
index 6bd71a5c3..8a251f4c9 100644
--- a/targets/minecraft/world/entity/Entity.cpp
+++ b/targets/minecraft/world/entity/Entity.cpp
@@ -1,38 +1,39 @@
+#include "Entity.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
-#include <cstdint>
-#include <optional>
+
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <format>
 #include <memory>
 #include <numbers>
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "SyncedEntityData.h"
 #include "EntityIO.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "EntityPos.h"
-#include "Entity.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/PlayerList.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "SyncedEntityData.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/DoubleTag.h"
-#include "nbt/FloatTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Pos.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
@@ -46,9 +47,10 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/DoubleTag.h"
+#include "nbt/FloatTag.h"
+#include "nbt/ListTag.h"
 
 thread_local bool Entity::m_tlsUseSmallIds = false;
 
diff --git a/targets/minecraft/world/entity/Entity.h b/targets/minecraft/world/entity/Entity.h
index 4bdeb9d3b..c516a2a68 100644
--- a/targets/minecraft/world/entity/Entity.h
+++ b/targets/minecraft/world/entity/Entity.h
@@ -3,15 +3,13 @@
 #include <cstdint>
 #include <optional>
 
-#include "nbt/ListTag.h"
+#include "console_helpers/Definitions.h"
+#include "java/Class.h"
+#include "minecraft/world/phys/AABB.h"
+#include "minecraft/world/phys/Vec3.h"
 #include "nbt/DoubleTag.h"
 #include "nbt/FloatTag.h"
-
-#include "java/Class.h"
-
-#include "minecraft/world/phys/Vec3.h"
-#include "console_helpers/Definitions.h"
-#include "minecraft/world/phys/AABB.h"
+#include "nbt/ListTag.h"
 
 class LivingEntity;
 class LightningBolt;
diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp
index 0a488a799..0246b2f78 100644
--- a/targets/minecraft/world/entity/EntityIO.cpp
+++ b/targets/minecraft/world/entity/EntityIO.cpp
@@ -1,19 +1,20 @@
-#include "java/Class.h"
-#include "Painting.h"
-#include "java/System.h"
+#include "EntityIO.h"
+
 #include "Entity.h"
-#include "minecraft/world/entity/boss/wither/WitherBoss.h"
+#include "Painting.h"
+#include "java/Class.h"
+#include "java/System.h"
 #include "minecraft/world/entity/ambient/net.minecraft.world.entity.ambient.h"
 #include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
 #include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
-#include "net.minecraft.world.entity.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "nbt/com.mojang.nbt.h"
-#include "EntityIO.h"
+#include "net.minecraft.world.entity.h"
 
 std::unordered_map<std::wstring, entityCreateFn>* EntityIO::idCreateMap =
     new std::unordered_map<std::wstring, entityCreateFn>;
diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h
index aa1ebd541..a75ddcbae 100644
--- a/targets/minecraft/world/entity/EntityIO.h
+++ b/targets/minecraft/world/entity/EntityIO.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Entity.h"
-#include "java/JavaIntHash.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "java/JavaIntHash.h"
 
 class Level;
 class CompoundTag;
diff --git a/targets/minecraft/world/entity/EntityPos.cpp b/targets/minecraft/world/entity/EntityPos.cpp
index cd89ab58f..33c8c6006 100644
--- a/targets/minecraft/world/entity/EntityPos.cpp
+++ b/targets/minecraft/world/entity/EntityPos.cpp
@@ -1,4 +1,5 @@
 #include "EntityPos.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/EntitySelector.cpp b/targets/minecraft/world/entity/EntitySelector.cpp
index 7ca8f0cac..c25227ad5 100644
--- a/targets/minecraft/world/entity/EntitySelector.cpp
+++ b/targets/minecraft/world/entity/EntitySelector.cpp
@@ -1,4 +1,5 @@
 #include "EntitySelector.h"
+
 #include "java/Class.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/ExperienceOrb.cpp b/targets/minecraft/world/entity/ExperienceOrb.cpp
index d4fa12962..f49e81e52 100644
--- a/targets/minecraft/world/entity/ExperienceOrb.cpp
+++ b/targets/minecraft/world/entity/ExperienceOrb.cpp
@@ -1,13 +1,14 @@
+#include "ExperienceOrb.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "java/JavaMath.h"
-#include "ExperienceOrb.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/player/Player.h"
@@ -16,6 +17,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 const int ExperienceOrb::LIFETIME =
     5 * 60 * SharedConstants::TICKS_PER_SECOND;  // Five minutes!
diff --git a/targets/minecraft/world/entity/FlyingMob.cpp b/targets/minecraft/world/entity/FlyingMob.cpp
index 10e5e5885..4e2325f8c 100644
--- a/targets/minecraft/world/entity/FlyingMob.cpp
+++ b/targets/minecraft/world/entity/FlyingMob.cpp
@@ -1,6 +1,7 @@
+#include "FlyingMob.h"
+
 #include <math.h>
 
-#include "FlyingMob.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/entity/HangingEntity.cpp b/targets/minecraft/world/entity/HangingEntity.cpp
index 4d1518f97..278ffe537 100644
--- a/targets/minecraft/world/entity/HangingEntity.cpp
+++ b/targets/minecraft/world/entity/HangingEntity.cpp
@@ -1,11 +1,12 @@
+#include "HangingEntity.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <format>
 #include <string>
 #include <vector>
 
-#include "HangingEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Direction.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -15,6 +16,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 void HangingEntity::_init(Level* level) {
     checkInterval = 0;
diff --git a/targets/minecraft/world/entity/ItemFrame.cpp b/targets/minecraft/world/entity/ItemFrame.cpp
index c3673de5d..53198fd0e 100644
--- a/targets/minecraft/world/entity/ItemFrame.cpp
+++ b/targets/minecraft/world/entity/ItemFrame.cpp
@@ -1,12 +1,13 @@
+#include "ItemFrame.h"
+
 #include <stdint.h>
+
 #include <string>
 
-#include "ItemFrame.h"
-#include "minecraft/world/entity/ItemFrame.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/HangingEntity.h"
+#include "minecraft/world/entity/ItemFrame.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
@@ -15,6 +16,7 @@
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/saveddata/MapItemSavedData.h"
+#include "nbt/CompoundTag.h"
 
 // 4J - added for common ctor code
 void ItemFrame::_init() {
diff --git a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp
index 809fe6663..d843737b6 100644
--- a/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp
+++ b/targets/minecraft/world/entity/LeashFenceKnotEntity.cpp
@@ -1,7 +1,8 @@
+#include "LeashFenceKnotEntity.h"
+
 #include <format>
 #include <vector>
 
-#include "LeashFenceKnotEntity.h"
 #include "minecraft/world/entity/HangingEntity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/player/Abilities.h"
diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp
index 419fb3b97..a45fc6b4f 100644
--- a/targets/minecraft/world/entity/LivingEntity.cpp
+++ b/targets/minecraft/world/entity/LivingEntity.cpp
@@ -1,35 +1,32 @@
+#include "LivingEntity.h"
+
 #include <stdint.h>
 #include <stdlib.h>
-#include <optional>
+
 #include <algorithm>
 #include <cmath>
 #include <format>
 #include <memory>
 #include <numbers>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "java/JavaMath.h"
-#include "LivingEntity.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/level/EntityTracker.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/stats/GenericStats.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Class.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/FloatTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/ShortTag.h"
-#include "nbt/Tag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/AnimatePacket.h"
 #include "minecraft/network/packet/SetEquippedItemPacket.h"
 #include "minecraft/network/packet/TakeItemEntityPacket.h"
+#include "minecraft/server/level/EntityTracker.h"
+#include "minecraft/server/level/ServerLevel.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/CombatTracker.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -65,6 +62,11 @@
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
 #include "minecraft/world/scores/Team.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/FloatTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/ShortTag.h"
+#include "nbt/Tag.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/entity/LivingEntity.h b/targets/minecraft/world/entity/LivingEntity.h
index 95db3fd04..3b5830d31 100644
--- a/targets/minecraft/world/entity/LivingEntity.h
+++ b/targets/minecraft/world/entity/LivingEntity.h
@@ -5,8 +5,8 @@
 
 #include "Entity.h"
 #include "MobType.h"
-#include "minecraft/world/entity/ai/goal/GoalSelector.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/world/entity/ai/goal/GoalSelector.h"
 
 class CombatTracker;
 class AttributeInstance;
diff --git a/targets/minecraft/world/entity/Mob.cpp b/targets/minecraft/world/entity/Mob.cpp
index f022f68c8..718f20c6d 100644
--- a/targets/minecraft/world/entity/Mob.cpp
+++ b/targets/minecraft/world/entity/Mob.cpp
@@ -1,5 +1,8 @@
+#include "minecraft/world/entity/Mob.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <algorithm>
 #include <format>
 #include <memory>
@@ -7,18 +10,16 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/level/EntityTracker.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/world/entity/item/ItemEntity.h"
-#include "minecraft/world/entity/Mob.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/FloatTag.h"
-#include "nbt/ListTag.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/SetEntityLinkPacket.h"
+#include "minecraft/server/level/EntityTracker.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/entity/Entity.h"
@@ -37,6 +38,7 @@
 #include "minecraft/world/entity/ai/goal/GoalSelector.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
 #include "minecraft/world/entity/ai/sensing/Sensing.h"
+#include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
@@ -50,9 +52,9 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/FloatTag.h"
+#include "nbt/ListTag.h"
 
 const float Mob::MAX_WEARING_ARMOR_CHANCE = 0.15f;
 const float Mob::MAX_PICKUP_LOOT_CHANCE = 0.55f;
diff --git a/targets/minecraft/world/entity/MobCategory.cpp b/targets/minecraft/world/entity/MobCategory.cpp
index da2247a76..2965e3519 100644
--- a/targets/minecraft/world/entity/MobCategory.cpp
+++ b/targets/minecraft/world/entity/MobCategory.cpp
@@ -1,7 +1,8 @@
+#include "MobCategory.h"
+
 #include <vector>
 
 #include "minecraft/world/level/material/Material.h"
-#include "MobCategory.h"
 
 MobCategory* MobCategory::monster = nullptr;
 MobCategory* MobCategory::creature = nullptr;
diff --git a/targets/minecraft/world/entity/MobCategory.h b/targets/minecraft/world/entity/MobCategory.h
index c9dc64ab3..0d0158ce4 100644
--- a/targets/minecraft/world/entity/MobCategory.h
+++ b/targets/minecraft/world/entity/MobCategory.h
@@ -2,6 +2,7 @@
 
 #include <format>
 #include <typeinfo>
+#include <vector>
 
 #include "java/Class.h"
 
diff --git a/targets/minecraft/world/entity/OwnableEntity.h b/targets/minecraft/world/entity/OwnableEntity.h
index d360115a7..ced499659 100644
--- a/targets/minecraft/world/entity/OwnableEntity.h
+++ b/targets/minecraft/world/entity/OwnableEntity.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <string>
+
+class Entity;
+
 class OwnableEntity {
 public:
     virtual std::wstring getOwnerUUID() = 0;
diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp
index 5e16942df..9ea04d7bb 100644
--- a/targets/minecraft/world/entity/Painting.cpp
+++ b/targets/minecraft/world/entity/Painting.cpp
@@ -1,17 +1,18 @@
+#include "Painting.h"
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "Painting.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/HangingEntity.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "nbt/CompoundTag.h"
 
 typedef Painting::Motive _Motive;
 const _Motive* Painting::Motive::values[] = {
diff --git a/targets/minecraft/world/entity/PathfinderMob.cpp b/targets/minecraft/world/entity/PathfinderMob.cpp
index d362d1bfb..96763ae1f 100644
--- a/targets/minecraft/world/entity/PathfinderMob.cpp
+++ b/targets/minecraft/world/entity/PathfinderMob.cpp
@@ -1,6 +1,7 @@
+#include "PathfinderMob.h"
+
 #include <cstdlib>
 
-#include "PathfinderMob.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/Pos.h"
diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp
index 43b40f2d6..b24db8a8b 100644
--- a/targets/minecraft/world/entity/SyncedEntityData.cpp
+++ b/targets/minecraft/world/entity/SyncedEntityData.cpp
@@ -1,12 +1,14 @@
+#include "SyncedEntityData.h"
+
 #include <assert.h>
+
 #include <vector>
 
-#include "SyncedEntityData.h"
-#include "minecraft/world/entity/SyncedEntityData.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/network/packet/Packet.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 
 SynchedEntityData::SynchedEntityData() {
     m_isDirty = false;
diff --git a/targets/minecraft/world/entity/SyncedEntityData.h b/targets/minecraft/world/entity/SyncedEntityData.h
index eb240b14e..7a21fefb8 100644
--- a/targets/minecraft/world/entity/SyncedEntityData.h
+++ b/targets/minecraft/world/entity/SyncedEntityData.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
diff --git a/targets/minecraft/world/entity/TamableAnimal.cpp b/targets/minecraft/world/entity/TamableAnimal.cpp
index 598b17561..94d9f05c4 100644
--- a/targets/minecraft/world/entity/TamableAnimal.cpp
+++ b/targets/minecraft/world/entity/TamableAnimal.cpp
@@ -1,15 +1,16 @@
-#include "SyncedEntityData.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "TamableAnimal.h"
+
+#include "SyncedEntityData.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/world/entity/player/Player.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityEvent.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/ai/goal/SitGoal.h"
 #include "minecraft/world/entity/animal/Animal.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 TamableAnimal::TamableAnimal(Level* level) : Animal(level) {
     sitGoal = new SitGoal(this);
diff --git a/targets/minecraft/world/entity/TamableAnimal.h b/targets/minecraft/world/entity/TamableAnimal.h
index b873e12a6..a372af386 100644
--- a/targets/minecraft/world/entity/TamableAnimal.h
+++ b/targets/minecraft/world/entity/TamableAnimal.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/animal/Animal.h"
 #include "OwnableEntity.h"
+#include "minecraft/world/entity/animal/Animal.h"
 
 class SitGoal;
 class Level;
diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeInstance.h b/targets/minecraft/world/entity/ai/attributes/AttributeInstance.h
index 2492877df..cbbc178cf 100644
--- a/targets/minecraft/world/entity/ai/attributes/AttributeInstance.h
+++ b/targets/minecraft/world/entity/ai/attributes/AttributeInstance.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "AttributeModifier.h"
-
 #include <unordered_set>
 
+#include "AttributeModifier.h"
+
 class AttributeInstance {
 public:
     virtual ~AttributeInstance() {}
diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp
index cf6e23e3a..a3bdcc91d 100644
--- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp
+++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp
@@ -1,10 +1,11 @@
+#include "AttributeModifier.h"
+
 #include <assert.h>
 #include <wchar.h>
 
-#include "AttributeModifier.h"
-#include "minecraft/util/HtmlString.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/util/HtmlString.h"
 
 void AttributeModifier::_init(eMODIFIER_ID id, const std::wstring name,
                               double amount, int operation) {
diff --git a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp
index 818f3c8f6..d1bb67d3a 100644
--- a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp
+++ b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.cpp
@@ -1,7 +1,8 @@
+#include "BaseAttributeMap.h"
+
 #include <utility>
 #include <vector>
 
-#include "BaseAttributeMap.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h
index f11b02c1f..37dcab0a7 100644
--- a/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h
+++ b/targets/minecraft/world/entity/ai/attributes/BaseAttributeMap.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <format>
-#include <vector>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
 
diff --git a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp
index b99298587..7a33c3ffa 100644
--- a/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp
+++ b/targets/minecraft/world/entity/ai/attributes/ModifiableAttributeInstance.cpp
@@ -1,7 +1,9 @@
+#include "ModifiableAttributeInstance.h"
+
 #include <assert.h>
+
 #include <utility>
 
-#include "ModifiableAttributeInstance.h"
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
 #include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h"
 
diff --git a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp
index 47f4a0301..4c1b65fd5 100644
--- a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp
+++ b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.cpp
@@ -1,4 +1,5 @@
 #include "RangedAttribute.h"
+
 #include "minecraft/world/entity/ai/attributes/BaseAttribute.h"
 
 RangedAttribute::RangedAttribute(eATTRIBUTE_ID id, double defaultValue,
diff --git a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp
index c4478cdcb..2b9b8252b 100644
--- a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp
+++ b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp
@@ -1,10 +1,11 @@
+#include "ServersideAttributeMap.h"
+
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "AttributeInstance.h"
 #include "ModifiableAttributeInstance.h"
-#include "ServersideAttributeMap.h"
 #include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h"
 
 AttributeInstance* ServersideAttributeMap::getInstance(Attribute* attribute) {
diff --git a/targets/minecraft/world/entity/ai/control/BodyControl.cpp b/targets/minecraft/world/entity/ai/control/BodyControl.cpp
index 118835d60..af72ada9f 100644
--- a/targets/minecraft/world/entity/ai/control/BodyControl.cpp
+++ b/targets/minecraft/world/entity/ai/control/BodyControl.cpp
@@ -1,7 +1,8 @@
+#include "BodyControl.h"
+
 #include <algorithm>
 #include <cstdlib>
 
-#include "BodyControl.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/ai/control/MoveControl.h"
diff --git a/targets/minecraft/world/entity/ai/control/JumpControl.cpp b/targets/minecraft/world/entity/ai/control/JumpControl.cpp
index 4fe9eb8de..c2a150f2a 100644
--- a/targets/minecraft/world/entity/ai/control/JumpControl.cpp
+++ b/targets/minecraft/world/entity/ai/control/JumpControl.cpp
@@ -1,4 +1,5 @@
 #include "JumpControl.h"
+
 #include "minecraft/world/entity/Mob.h"
 
 JumpControl::JumpControl(Mob* mob) {
diff --git a/targets/minecraft/world/entity/ai/control/LookControl.cpp b/targets/minecraft/world/entity/ai/control/LookControl.cpp
index 083d26922..cd79a000c 100644
--- a/targets/minecraft/world/entity/ai/control/LookControl.cpp
+++ b/targets/minecraft/world/entity/ai/control/LookControl.cpp
@@ -1,7 +1,9 @@
+#include "LookControl.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "LookControl.h"
 #include "java/Class.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/ai/control/MoveControl.cpp b/targets/minecraft/world/entity/ai/control/MoveControl.cpp
index 2d6f8288d..7e5833b93 100644
--- a/targets/minecraft/world/entity/ai/control/MoveControl.cpp
+++ b/targets/minecraft/world/entity/ai/control/MoveControl.cpp
@@ -1,7 +1,9 @@
+#include "MoveControl.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "MoveControl.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
diff --git a/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h b/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h
index d0a3e7832..2c00c0c07 100644
--- a/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h
+++ b/targets/minecraft/world/entity/ai/control/net.minecraft.world.entity.ai.control.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Control.h"
 #include "BodyControl.h"
+#include "Control.h"
 #include "JumpControl.h"
 #include "LookControl.h"
 #include "MoveControl.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp
index 0706bf060..8e0fd27e3 100644
--- a/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/AvoidPlayerGoal.cpp
@@ -1,8 +1,9 @@
+#include "AvoidPlayerGoal.h"
+
 #include <format>
 #include <optional>
 #include <vector>
 
-#include "AvoidPlayerGoal.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntitySelector.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/BegGoal.cpp b/targets/minecraft/world/entity/ai/goal/BegGoal.cpp
index b8fb3733c..d03b84767 100644
--- a/targets/minecraft/world/entity/ai/goal/BegGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/BegGoal.cpp
@@ -1,4 +1,5 @@
 #include "BegGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/control/LookControl.h"
diff --git a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp
index 3c0ab64bb..3e7649924 100644
--- a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.cpp
@@ -1,4 +1,5 @@
 #include "BreakDoorGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.h b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.h
index e306420fc..163d2b68f 100644
--- a/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.h
+++ b/targets/minecraft/world/entity/ai/goal/BreakDoorGoal.h
@@ -2,7 +2,6 @@
 
 #include "DoorInteractGoal.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/SharedConstants.h"
 
 class Mob;
 
diff --git a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp
index a8c3d369a..c596ea334 100644
--- a/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/BreedGoal.cpp
@@ -1,14 +1,15 @@
-#include <limits>
+#include "BreedGoal.h"
+
 #include <format>
+#include <limits>
 #include <vector>
 
-#include "BreedGoal.h"
-#include "minecraft/world/entity/ExperienceOrb.h"
-#include "minecraft/stats/GenericStats.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/AgeableMob.h"
+#include "minecraft/world/entity/ExperienceOrb.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/control/LookControl.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
diff --git a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp
index 5f0922042..14bbec987 100644
--- a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.cpp
@@ -1,10 +1,12 @@
+#include "ControlledByPlayerGoal.h"
+
 #include <math.h>
+
 #include <algorithm>
 #include <memory>
 #include <numbers>
 #include <vector>
 
-#include "ControlledByPlayerGoal.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h
index 7b6258cf0..8113a7f83 100644
--- a/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h
+++ b/targets/minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h
@@ -2,7 +2,6 @@
 
 #include "Goal.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/SharedConstants.h"
 
 class Mob;
 
diff --git a/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp b/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp
index 5c52bd1d8..7359a9e82 100644
--- a/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/DoorInteractGoal.cpp
@@ -1,6 +1,7 @@
+#include "DoorInteractGoal.h"
+
 #include <algorithm>
 
-#include "DoorInteractGoal.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
diff --git a/targets/minecraft/world/entity/ai/goal/EatTileGoal.cpp b/targets/minecraft/world/entity/ai/goal/EatTileGoal.cpp
index 0c8b56acf..7a70150db 100644
--- a/targets/minecraft/world/entity/ai/goal/EatTileGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/EatTileGoal.cpp
@@ -1,6 +1,7 @@
+#include "EatTileGoal.h"
+
 #include <algorithm>
 
-#include "EatTileGoal.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/EntityEvent.h"
diff --git a/targets/minecraft/world/entity/ai/goal/EatTileGoal.h b/targets/minecraft/world/entity/ai/goal/EatTileGoal.h
index 5286ad6bd..9e64af0a4 100644
--- a/targets/minecraft/world/entity/ai/goal/EatTileGoal.h
+++ b/targets/minecraft/world/entity/ai/goal/EatTileGoal.h
@@ -2,7 +2,6 @@
 
 #include "Goal.h"
 #include "minecraft/SharedConstants.h"
-#include "minecraft/SharedConstants.h"
 
 class Level;
 class Mob;
diff --git a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp
index 5225aefb6..213fcd45c 100644
--- a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.cpp
@@ -1,6 +1,7 @@
+#include "FleeSunGoal.h"
+
 #include <optional>
 
-#include "FleeSunGoal.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h
index bc299b42d..2f2e52d9f 100644
--- a/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h
+++ b/targets/minecraft/world/entity/ai/goal/FleeSunGoal.h
@@ -2,7 +2,6 @@
 
 #include <optional>
 
-#include "minecraft/world/phys/Vec3.h"
 #include "Goal.h"
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/world/entity/ai/goal/FloatGoal.cpp b/targets/minecraft/world/entity/ai/goal/FloatGoal.cpp
index 739cf4b70..5ec6512e4 100644
--- a/targets/minecraft/world/entity/ai/goal/FloatGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/FloatGoal.cpp
@@ -1,4 +1,5 @@
 #include "FloatGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp
index cef0cc755..56252db7d 100644
--- a/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/FollowOwnerGoal.cpp
@@ -1,4 +1,5 @@
 #include "FollowOwnerGoal.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp
index 61e6378e0..9eb22f35f 100644
--- a/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/FollowParentGoal.cpp
@@ -1,8 +1,9 @@
-#include <limits>
+#include "FollowParentGoal.h"
+
 #include <format>
+#include <limits>
 #include <vector>
 
-#include "FollowParentGoal.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
 #include "minecraft/world/entity/animal/Animal.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp
index 184c39f30..e0ee53251 100644
--- a/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp
+++ b/targets/minecraft/world/entity/ai/goal/GoalSelector.cpp
@@ -1,10 +1,11 @@
+#include "minecraft/world/entity/ai/goal/GoalSelector.h"
+
 #include <algorithm>
 #include <format>
 #include <vector>
 
 #include "Goal.h"
 #include "minecraft/world/entity/ai/goal/GoalSelector.h"
-#include "minecraft/world/entity/ai/goal/GoalSelector.h"
 
 class Level;
 
diff --git a/targets/minecraft/world/entity/ai/goal/GoalSelector.h b/targets/minecraft/world/entity/ai/goal/GoalSelector.h
index cfb21355d..4985d67f0 100644
--- a/targets/minecraft/world/entity/ai/goal/GoalSelector.h
+++ b/targets/minecraft/world/entity/ai/goal/GoalSelector.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <vector>
+
 class Goal;
+class Level;
 
 class GoalSelector {
 private:
diff --git a/targets/minecraft/world/entity/ai/goal/InteractGoal.cpp b/targets/minecraft/world/entity/ai/goal/InteractGoal.cpp
index 00ee9ba50..0c7183932 100644
--- a/targets/minecraft/world/entity/ai/goal/InteractGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/InteractGoal.cpp
@@ -1,4 +1,5 @@
 #include "InteractGoal.h"
+
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h"
 
diff --git a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp
index 799795f7a..53a7b11f3 100644
--- a/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/LeapAtTargetGoal.cpp
@@ -1,6 +1,7 @@
+#include "LeapAtTargetGoal.h"
+
 #include <math.h>
 
-#include "LeapAtTargetGoal.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp
index 298301ef1..50f1c0c1e 100644
--- a/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/LookAtPlayerGoal.cpp
@@ -1,4 +1,5 @@
 #include "LookAtPlayerGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp
index 8a58795f4..147c6efa2 100644
--- a/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/LookAtTradingPlayerGoal.cpp
@@ -1,6 +1,7 @@
+#include "LookAtTradingPlayerGoal.h"
+
 #include <memory>
 
-#include "LookAtTradingPlayerGoal.h"
 #include "minecraft/world/entity/ai/goal/LookAtPlayerGoal.h"
 #include "minecraft/world/entity/npc/Villager.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp
index c47a1295a..21e07e100 100644
--- a/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MakeLoveGoal.cpp
@@ -1,4 +1,5 @@
 #include "MakeLoveGoal.h"
+
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp b/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp
index 775d31a1f..983edc1fe 100644
--- a/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MeleeAttackGoal.cpp
@@ -1,7 +1,7 @@
+#include "MeleeAttackGoal.h"
+
 #include <algorithm>
 
-#include "minecraft/world/level/pathfinder/Path.h"
-#include "MeleeAttackGoal.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -10,6 +10,7 @@
 #include "minecraft/world/entity/ai/control/LookControl.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
 #include "minecraft/world/entity/ai/sensing/Sensing.h"
+#include "minecraft/world/level/pathfinder/Path.h"
 #include "minecraft/world/phys/AABB.h"
 
 void MeleeAttackGoal::_init(PathfinderMob* mob, double speedModifier,
diff --git a/targets/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp b/targets/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp
index 3439e35da..0bb42ebac 100644
--- a/targets/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MoveIndoorsGoal.cpp
@@ -1,6 +1,7 @@
+#include "MoveIndoorsGoal.h"
+
 #include <optional>
 
-#include "MoveIndoorsGoal.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp b/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp
index 9fd607539..31e2bd2a2 100644
--- a/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MoveThroughVillageGoal.cpp
@@ -1,9 +1,9 @@
-#include <limits>
+#include "MoveThroughVillageGoal.h"
+
 #include <format>
+#include <limits>
 #include <optional>
 
-#include "MoveThroughVillageGoal.h"
-#include "minecraft/world/level/pathfinder/Path.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
@@ -13,6 +13,7 @@
 #include "minecraft/world/entity/ai/village/Village.h"
 #include "minecraft/world/entity/ai/village/Villages.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/pathfinder/Path.h"
 #include "minecraft/world/phys/Vec3.h"
 
 MoveThroughVillageGoal::MoveThroughVillageGoal(PathfinderMob* mob,
diff --git a/targets/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp b/targets/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp
index 30ed64660..8d0e670fa 100644
--- a/targets/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MoveTowardsRestrictionGoal.cpp
@@ -1,7 +1,8 @@
+#include "MoveTowardsRestrictionGoal.h"
+
 #include <memory>
 #include <optional>
 
-#include "MoveTowardsRestrictionGoal.h"
 #include "minecraft/Pos.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp
index 165874df2..ddcba67a7 100644
--- a/targets/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/MoveTowardsTargetGoal.cpp
@@ -1,6 +1,7 @@
+#include "MoveTowardsTargetGoal.h"
+
 #include <optional>
 
-#include "MoveTowardsTargetGoal.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp b/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp
index 9c7f2cbf3..94da0fa58 100644
--- a/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/OcelotAttackGoal.cpp
@@ -1,6 +1,7 @@
+#include "OcelotAttackGoal.h"
+
 #include <algorithm>
 
-#include "OcelotAttackGoal.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp
index f693a2f16..842afae25 100644
--- a/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/OcelotSitOnTileGoal.cpp
@@ -1,7 +1,8 @@
+#include "OcelotSitOnTileGoal.h"
+
 #include <limits>
 #include <memory>
 
-#include "OcelotSitOnTileGoal.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp b/targets/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp
index cd78cbe04..3f964f4cc 100644
--- a/targets/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/OfferFlowerGoal.cpp
@@ -1,4 +1,5 @@
 #include "OfferFlowerGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/control/LookControl.h"
diff --git a/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp b/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp
index 4233ad595..2e0f0dab4 100644
--- a/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/OpenDoorGoal.cpp
@@ -1,4 +1,5 @@
 #include "OpenDoorGoal.h"
+
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/goal/DoorInteractGoal.h"
 #include "minecraft/world/level/tile/DoorTile.h"
diff --git a/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp b/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp
index c4d653225..4c6ffc05d 100644
--- a/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/PanicGoal.cpp
@@ -1,7 +1,8 @@
+#include "PanicGoal.h"
+
 #include <memory>
 #include <optional>
 
-#include "PanicGoal.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp
index 59c6928db..6eab57eba 100644
--- a/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/PlayGoal.cpp
@@ -1,9 +1,10 @@
-#include <limits>
+#include "PlayGoal.h"
+
 #include <format>
+#include <limits>
 #include <optional>
 #include <vector>
 
-#include "PlayGoal.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp b/targets/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp
index 2bbfef031..ac3b89ed1 100644
--- a/targets/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RandomLookAroundGoal.cpp
@@ -1,7 +1,9 @@
+#include "RandomLookAroundGoal.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "RandomLookAroundGoal.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp b/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp
index fc0068a83..8d12456a8 100644
--- a/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RandomStrollGoal.cpp
@@ -1,7 +1,8 @@
+#include "RandomStrollGoal.h"
+
 #include <memory>
 #include <optional>
 
-#include "RandomStrollGoal.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp
index fd818ac06..835b07821 100644
--- a/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RangedAttackGoal.cpp
@@ -1,4 +1,5 @@
 #include "RangedAttackGoal.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp b/targets/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp
index e6785d76f..d78890331 100644
--- a/targets/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RestrictOpenDoorGoal.cpp
@@ -1,4 +1,5 @@
 #include "RestrictOpenDoorGoal.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp b/targets/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp
index dc2233e74..1d7d7138a 100644
--- a/targets/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RestrictSunGoal.cpp
@@ -1,4 +1,5 @@
 #include "RestrictSunGoal.h"
+
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp b/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp
index f9cce0f29..17ec10374 100644
--- a/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.cpp
@@ -1,8 +1,8 @@
+#include "RunAroundLikeCrazyGoal.h"
+
 #include <memory>
 #include <optional>
 
-#include "minecraft/world/entity/ai/util/RandomPos.h"
-#include "RunAroundLikeCrazyGoal.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/Entity.h"
@@ -11,6 +11,7 @@
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
+#include "minecraft/world/entity/ai/util/RandomPos.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/ai/goal/SitGoal.cpp b/targets/minecraft/world/entity/ai/goal/SitGoal.cpp
index 85dd0ddac..9b9379325 100644
--- a/targets/minecraft/world/entity/ai/goal/SitGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/SitGoal.cpp
@@ -1,6 +1,7 @@
+#include "SitGoal.h"
+
 #include <memory>
 
-#include "SitGoal.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/TamableAnimal.h"
 #include "minecraft/world/entity/ai/control/Control.h"
diff --git a/targets/minecraft/world/entity/ai/goal/SwellGoal.cpp b/targets/minecraft/world/entity/ai/goal/SwellGoal.cpp
index c7ec6b6d7..9e55513b2 100644
--- a/targets/minecraft/world/entity/ai/goal/SwellGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/SwellGoal.cpp
@@ -1,4 +1,5 @@
 #include "SwellGoal.h"
+
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
diff --git a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp
index 3852c3393..9b5a658de 100644
--- a/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/TakeFlowerGoal.cpp
@@ -1,7 +1,8 @@
+#include "TakeFlowerGoal.h"
+
 #include <format>
 #include <vector>
 
-#include "TakeFlowerGoal.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/control/LookControl.h"
diff --git a/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp b/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp
index f339bd5be..a8b34a779 100644
--- a/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/TemptGoal.cpp
@@ -1,6 +1,7 @@
+#include "TemptGoal.h"
+
 #include <cstdlib>
 
-#include "TemptGoal.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/control/LookControl.h"
diff --git a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp
index 843c45580..0291aae2b 100644
--- a/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/TradeWithPlayerGoal.cpp
@@ -1,6 +1,7 @@
+#include "TradeWithPlayerGoal.h"
+
 #include <memory>
 
-#include "TradeWithPlayerGoal.h"
 #include "minecraft/world/entity/ai/control/Control.h"
 #include "minecraft/world/entity/ai/navigation/PathNavigation.h"
 #include "minecraft/world/entity/npc/Villager.h"
diff --git a/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h b/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h
index 73273e13b..e93067309 100644
--- a/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h
+++ b/targets/minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Goal.h"
 #include "AvoidPlayerGoal.h"
 #include "BegGoal.h"
 #include "BreakDoorGoal.h"
@@ -9,9 +8,10 @@
 #include "DoorInteractGoal.h"
 #include "EatTileGoal.h"
 #include "FleeSunGoal.h"
+#include "FloatGoal.h"
 #include "FollowOwnerGoal.h"
 #include "FollowParentGoal.h"
-#include "FloatGoal.h"
+#include "Goal.h"
 #include "GoalSelector.h"
 #include "InteractGoal.h"
 #include "LeapAtTargetGoal.h"
@@ -23,10 +23,10 @@
 #include "MoveThroughVillageGoal.h"
 #include "MoveTowardsRestrictionGoal.h"
 #include "MoveTowardsTargetGoal.h"
+#include "OcelotAttackGoal.h"
 #include "OcelotSitOnTileGoal.h"
 #include "OfferFlowerGoal.h"
 #include "OpenDoorGoal.h"
-#include "OcelotAttackGoal.h"
 #include "PanicGoal.h"
 #include "PlayGoal.h"
 #include "RandomLookAroundGoal.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp
index 73b9f63b9..20922981c 100644
--- a/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/DefendVillageTargetGoal.cpp
@@ -1,4 +1,5 @@
 #include "DefendVillageTargetGoal.h"
+
 #include "java/Random.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp
index 499ce985f..061165f98 100644
--- a/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.cpp
@@ -1,8 +1,9 @@
+#include "HurtByTargetGoal.h"
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "HurtByTargetGoal.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/ai/goal/target/TargetGoal.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp
index d632d979e..9374a9d94 100644
--- a/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.cpp
@@ -1,8 +1,9 @@
+#include "NearestAttackableTargetGoal.h"
+
 #include <algorithm>
 #include <format>
 #include <vector>
 
-#include "NearestAttackableTargetGoal.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp
index 077cfa049..6a45300f7 100644
--- a/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.cpp
@@ -1,4 +1,5 @@
 #include "NonTameRandomTargetGoal.h"
+
 #include "minecraft/world/entity/TamableAnimal.h"
 #include "minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.h"
 
diff --git a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp
index ab2f4aaaf..fdac558c2 100644
--- a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtByTargetGoal.cpp
@@ -1,4 +1,5 @@
 #include "OwnerHurtByTargetGoal.h"
+
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/TamableAnimal.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp
index 6783251d5..1d0f1f5e5 100644
--- a/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/OwnerHurtTargetGoal.cpp
@@ -1,4 +1,5 @@
 #include "OwnerHurtTargetGoal.h"
+
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/TamableAnimal.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp
index 158d9e903..006d06428 100644
--- a/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp
+++ b/targets/minecraft/world/entity/ai/goal/target/TargetGoal.cpp
@@ -1,6 +1,7 @@
+#include "TargetGoal.h"
+
 #include <string>
 
-#include "TargetGoal.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h b/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h
index 98b96a16a..fecd00384 100644
--- a/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h
+++ b/targets/minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "TargetGoal.h"
 #include "DefendVillageTargetGoal.h"
 #include "HurtByTargetGoal.h"
 #include "NearestAttackableTargetGoal.h"
 #include "NonTameRandomTargetGoal.h"
 #include "OwnerHurtByTargetGoal.h"
-#include "OwnerHurtTargetGoal.h"
\ No newline at end of file
+#include "OwnerHurtTargetGoal.h"
+#include "TargetGoal.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp
index c29cccfd6..3b4d7d5a8 100644
--- a/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp
+++ b/targets/minecraft/world/entity/ai/navigation/PathNavigation.cpp
@@ -1,7 +1,9 @@
+#include "PathNavigation.h"
+
 #include <stdlib.h>
+
 #include <cmath>
 
-#include "PathNavigation.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
diff --git a/targets/minecraft/world/entity/ai/sensing/Sensing.cpp b/targets/minecraft/world/entity/ai/sensing/Sensing.cpp
index 8c20894eb..611515eb2 100644
--- a/targets/minecraft/world/entity/ai/sensing/Sensing.cpp
+++ b/targets/minecraft/world/entity/ai/sensing/Sensing.cpp
@@ -1,4 +1,5 @@
 #include "Sensing.h"
+
 #include "minecraft/world/entity/Mob.h"
 
 class Entity;
diff --git a/targets/minecraft/world/entity/ai/util/RandomPos.cpp b/targets/minecraft/world/entity/ai/util/RandomPos.cpp
index 7ddac1b56..309251b01 100644
--- a/targets/minecraft/world/entity/ai/util/RandomPos.cpp
+++ b/targets/minecraft/world/entity/ai/util/RandomPos.cpp
@@ -1,6 +1,7 @@
+#include "RandomPos.h"
+
 #include <optional>
 
-#include "RandomPos.h"
 #include "java/Random.h"
 #include "minecraft/Pos.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/entity/ai/util/RandomPos.h b/targets/minecraft/world/entity/ai/util/RandomPos.h
index ec018d2ea..e1e2e5b2d 100644
--- a/targets/minecraft/world/entity/ai/util/RandomPos.h
+++ b/targets/minecraft/world/entity/ai/util/RandomPos.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <optional>
 #include <memory>
+#include <optional>
 
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/world/entity/ai/village/DoorInfo.cpp b/targets/minecraft/world/entity/ai/village/DoorInfo.cpp
index 33c9a197b..37b30bd40 100644
--- a/targets/minecraft/world/entity/ai/village/DoorInfo.cpp
+++ b/targets/minecraft/world/entity/ai/village/DoorInfo.cpp
@@ -1,7 +1,7 @@
-#include <cmath>
-
 #include "DoorInfo.h"
 
+#include <cmath>
+
 DoorInfo::DoorInfo(int x, int y, int z, int insideDx, int insideDy,
                    int timeStamp)
     : x(x), y(y), z(z), insideDx(insideDx), insideDz(insideDy) {
diff --git a/targets/minecraft/world/entity/ai/village/Village.cpp b/targets/minecraft/world/entity/ai/village/Village.cpp
index e3a667355..360625808 100644
--- a/targets/minecraft/world/entity/ai/village/Village.cpp
+++ b/targets/minecraft/world/entity/ai/village/Village.cpp
@@ -1,14 +1,14 @@
+#include "Village.h"
+
 #include <stdlib.h>
-#include <limits>
-#include <optional>
+
 #include <algorithm>
 #include <cmath>
+#include <limits>
+#include <optional>
 #include <utility>
 
-#include "Village.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/Pos.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/util/Mth.h"
@@ -18,6 +18,8 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 class Entity;
 
diff --git a/targets/minecraft/world/entity/ai/village/Village.h b/targets/minecraft/world/entity/ai/village/Village.h
index c2a915a86..b15fadab5 100644
--- a/targets/minecraft/world/entity/ai/village/Village.h
+++ b/targets/minecraft/world/entity/ai/village/Village.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <optional>
 #include <format>
 #include <memory>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp
index 1bfcfadee..f73d7a127 100644
--- a/targets/minecraft/world/entity/ai/village/VillageSiege.cpp
+++ b/targets/minecraft/world/entity/ai/village/VillageSiege.cpp
@@ -1,10 +1,12 @@
+#include "VillageSiege.h"
+
 #include <math.h>
-#include <optional>
+
 #include <format>
 #include <numbers>
+#include <optional>
 #include <vector>
 
-#include "VillageSiege.h"
 #include "java/Random.h"
 #include "minecraft/Pos.h"
 #include "minecraft/world/entity/MobCategory.h"
diff --git a/targets/minecraft/world/entity/ai/village/VillageSiege.h b/targets/minecraft/world/entity/ai/village/VillageSiege.h
index cacfdf104..c5818fb7a 100644
--- a/targets/minecraft/world/entity/ai/village/VillageSiege.h
+++ b/targets/minecraft/world/entity/ai/village/VillageSiege.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <optional>
 #include <memory>
+#include <optional>
 
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/world/entity/ai/village/Villages.cpp b/targets/minecraft/world/entity/ai/village/Villages.cpp
index b1144e9c6..9ab4f6cd4 100644
--- a/targets/minecraft/world/entity/ai/village/Villages.cpp
+++ b/targets/minecraft/world/entity/ai/village/Villages.cpp
@@ -1,13 +1,15 @@
+#include "Villages.h"
+
 #include <stdlib.h>
+
 #include <limits>
 
-#include "Villages.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/Pos.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/DoorTile.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 const std::wstring Villages::VILLAGE_FILE_ID = L"villages";
 
diff --git a/targets/minecraft/world/entity/ai/village/Villages.h b/targets/minecraft/world/entity/ai/village/Villages.h
index 99ea19170..d617e4bd5 100644
--- a/targets/minecraft/world/entity/ai/village/Villages.h
+++ b/targets/minecraft/world/entity/ai/village/Villages.h
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/saveddata/SavedData.h"
 #include "minecraft/world/entity/ai/village/DoorInfo.h"
 #include "minecraft/world/entity/ai/village/Village.h"
 #include "minecraft/world/level/saveddata/SavedData.h"
diff --git a/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h b/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h
index 7aeb2d82e..0bccb3428 100644
--- a/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h
+++ b/targets/minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h
@@ -2,5 +2,5 @@
 
 #include "DoorInfo.h"
 #include "Village.h"
-#include "Villages.h"
-#include "VillageSiege.h"
\ No newline at end of file
+#include "VillageSiege.h"
+#include "Villages.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/ambient/AmbientCreature.cpp b/targets/minecraft/world/entity/ambient/AmbientCreature.cpp
index 5b1f11a35..563549920 100644
--- a/targets/minecraft/world/entity/ambient/AmbientCreature.cpp
+++ b/targets/minecraft/world/entity/ambient/AmbientCreature.cpp
@@ -1,7 +1,7 @@
-#include <memory>
-
 #include "AmbientCreature.h"
 
+#include <memory>
+
 class Level;
 
 AmbientCreature::AmbientCreature(Level* level) : Mob(level) {}
diff --git a/targets/minecraft/world/entity/ambient/AmbientCreature.h b/targets/minecraft/world/entity/ambient/AmbientCreature.h
index cb96b2f39..596091c17 100644
--- a/targets/minecraft/world/entity/ambient/AmbientCreature.h
+++ b/targets/minecraft/world/entity/ambient/AmbientCreature.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/Creature.h"
 #include "minecraft/world/entity/Mob.h"
 
diff --git a/targets/minecraft/world/entity/ambient/Bat.cpp b/targets/minecraft/world/entity/ambient/Bat.cpp
index d48eaecd2..17c9492f5 100644
--- a/targets/minecraft/world/entity/ambient/Bat.cpp
+++ b/targets/minecraft/world/entity/ambient/Bat.cpp
@@ -1,13 +1,14 @@
+#include "Bat.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <string>
 
-#include "Bat.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Pos.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
@@ -17,6 +18,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 Bat::Bat(Level* level) : AmbientCreature(level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/animal/Animal.cpp b/targets/minecraft/world/entity/animal/Animal.cpp
index 0895f3ef5..78b3f5e66 100644
--- a/targets/minecraft/world/entity/animal/Animal.cpp
+++ b/targets/minecraft/world/entity/animal/Animal.cpp
@@ -1,20 +1,21 @@
+#include "Animal.h"
+
 #include <cmath>
 
-#include "nbt/com.mojang.nbt.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "java/Random.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
+#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
-#include "minecraft/util/Mth.h"
-#include "java/Random.h"
-#include "Animal.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "nbt/com.mojang.nbt.h"
 
 Animal::Animal(Level* level) : AgableMob(level) {
     //	inLove = 0;
diff --git a/targets/minecraft/world/entity/animal/Chicken.cpp b/targets/minecraft/world/entity/animal/Chicken.cpp
index e55abd79d..fe69ff10e 100644
--- a/targets/minecraft/world/entity/animal/Chicken.cpp
+++ b/targets/minecraft/world/entity/animal/Chicken.cpp
@@ -1,8 +1,9 @@
+#include "Chicken.h"
+
 #include <memory>
 
-#include "Chicken.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/goal/BreedGoal.h"
 #include "minecraft/world/entity/ai/goal/FloatGoal.h"
diff --git a/targets/minecraft/world/entity/animal/Cow.cpp b/targets/minecraft/world/entity/animal/Cow.cpp
index 12a8febcf..a12908a9a 100644
--- a/targets/minecraft/world/entity/animal/Cow.cpp
+++ b/targets/minecraft/world/entity/animal/Cow.cpp
@@ -1,8 +1,9 @@
+#include "Cow.h"
+
 #include <memory>
 
-#include "Cow.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/goal/BreedGoal.h"
diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp
index d9f1c5b20..85c11697d 100644
--- a/targets/minecraft/world/entity/animal/EntityHorse.cpp
+++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp
@@ -1,17 +1,17 @@
+#include "EntityHorse.h"
+
 #include <math.h>
-#include <limits>
+
 #include <algorithm>
+#include <limits>
 #include <numbers>
 
-#include "minecraft/client/renderer/Textures.h"
-#include "EntityHorse.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Random.h"
+#include "minecraft/client/renderer/Textures.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/effect/MobEffect.h"
@@ -48,6 +48,8 @@
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 class EntitySelector;
 class Path;
diff --git a/targets/minecraft/world/entity/animal/EntityHorse.h b/targets/minecraft/world/entity/animal/EntityHorse.h
index 6df586232..ff7793525 100644
--- a/targets/minecraft/world/entity/animal/EntityHorse.h
+++ b/targets/minecraft/world/entity/animal/EntityHorse.h
@@ -1,17 +1,18 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "Animal.h"
-#include "minecraft/world/net.minecraft.world.ContainerListener.h"
-#include "minecraft/world/entity/MobGroupData.h"
-#include "minecraft/world/entity/EntitySelector.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/EntitySelector.h"
+#include "minecraft/world/entity/MobGroupData.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/net.minecraft.world.ContainerListener.h"
 
 class Attribute;
 class AnimalChest;
diff --git a/targets/minecraft/world/entity/animal/Golem.cpp b/targets/minecraft/world/entity/animal/Golem.cpp
index 35bf80068..e3f81c8cf 100644
--- a/targets/minecraft/world/entity/animal/Golem.cpp
+++ b/targets/minecraft/world/entity/animal/Golem.cpp
@@ -1,4 +1,5 @@
 #include "Golem.h"
+
 #include "minecraft/world/entity/PathfinderMob.h"
 
 Golem::Golem(Level* level) : PathfinderMob(level) {}
diff --git a/targets/minecraft/world/entity/animal/Golem.h b/targets/minecraft/world/entity/animal/Golem.h
index ed7b71d33..432a92fe9 100644
--- a/targets/minecraft/world/entity/animal/Golem.h
+++ b/targets/minecraft/world/entity/animal/Golem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/Creature.h"
+#include "minecraft/world/entity/PathfinderMob.h"
 
 class Level;
 class CompoundTag;
diff --git a/targets/minecraft/world/entity/animal/MushroomCow.cpp b/targets/minecraft/world/entity/animal/MushroomCow.cpp
index 5ff1b4f05..fb93db10c 100644
--- a/targets/minecraft/world/entity/animal/MushroomCow.cpp
+++ b/targets/minecraft/world/entity/animal/MushroomCow.cpp
@@ -1,6 +1,7 @@
+#include "MushroomCow.h"
+
 #include <memory>
 
-#include "MushroomCow.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp
index 5d9aed46c..d34fadb5f 100644
--- a/targets/minecraft/world/entity/animal/Ocelot.cpp
+++ b/targets/minecraft/world/entity/animal/Ocelot.cpp
@@ -1,23 +1,24 @@
+#include "Ocelot.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
-#include "minecraft/world/entity/SyncedEntityData.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/Random.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "minecraft/stats/GenericStats.h"
-#include "Ocelot.h"
-#include "console_helpers/StringHelpers.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/SharedConstants.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityEvent.h"
 #include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/entity/TamableAnimal.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/control/MoveControl.h"
@@ -46,6 +47,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 #include "platform/PlatformServices.h"
 
 const double Ocelot::SNEAK_SPEED_MOD = 0.6;
diff --git a/targets/minecraft/world/entity/animal/Ocelot.h b/targets/minecraft/world/entity/animal/Ocelot.h
index cd5f787c0..d878bac88 100644
--- a/targets/minecraft/world/entity/animal/Ocelot.h
+++ b/targets/minecraft/world/entity/animal/Ocelot.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "minecraft/world/entity/TamableAnimal.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/TamableAnimal.h"
 
 class TemptGoal;
 class Entity;
diff --git a/targets/minecraft/world/entity/animal/Pig.cpp b/targets/minecraft/world/entity/animal/Pig.cpp
index f6ade0a90..b9c451e00 100644
--- a/targets/minecraft/world/entity/animal/Pig.cpp
+++ b/targets/minecraft/world/entity/animal/Pig.cpp
@@ -1,11 +1,12 @@
+#include "Pig.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "Pig.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
@@ -28,6 +29,7 @@
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 Pig::Pig(Level* level) : Animal(level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/animal/Sheep.cpp b/targets/minecraft/world/entity/animal/Sheep.cpp
index e55756180..1e5b5aeaf 100644
--- a/targets/minecraft/world/entity/animal/Sheep.cpp
+++ b/targets/minecraft/world/entity/animal/Sheep.cpp
@@ -1,13 +1,14 @@
+#include "Sheep.h"
+
 #include <math.h>
+
 #include <algorithm>
 #include <numbers>
 #include <string>
 
-#include "Sheep.h"
-#include "minecraft/stats/GenericStats.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/AgeableMob.h"
 #include "minecraft/world/entity/EntityEvent.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
@@ -36,6 +37,7 @@
 #include "minecraft/world/item/crafting/Recipes.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
 
 const float Sheep::COLOR[Sheep::COLOR_LENGTH][3] = {
     {1.0f, 1.0f, 1.0f},    // white
diff --git a/targets/minecraft/world/entity/animal/Sheep.h b/targets/minecraft/world/entity/animal/Sheep.h
index 8909a5802..3c13b0990 100644
--- a/targets/minecraft/world/entity/animal/Sheep.h
+++ b/targets/minecraft/world/entity/animal/Sheep.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Animal.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "java/Class.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/world/inventory/AbstractContainerMenu.h"
 
 class Random;
 class EatTileGoal;
diff --git a/targets/minecraft/world/entity/animal/SnowMan.cpp b/targets/minecraft/world/entity/animal/SnowMan.cpp
index 4aac6a515..6753eebb6 100644
--- a/targets/minecraft/world/entity/animal/SnowMan.cpp
+++ b/targets/minecraft/world/entity/animal/SnowMan.cpp
@@ -1,9 +1,10 @@
+#include "SnowMan.h"
+
 #include <memory>
 
-#include "SnowMan.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/animal/SnowMan.h b/targets/minecraft/world/entity/animal/SnowMan.h
index 1d75ba856..da4b28844 100644
--- a/targets/minecraft/world/entity/animal/SnowMan.h
+++ b/targets/minecraft/world/entity/animal/SnowMan.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Golem.h"
-#include "minecraft/world/entity/monster/RangedAttackMob.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/monster/RangedAttackMob.h"
 
 class Entity;
 class Level;
diff --git a/targets/minecraft/world/entity/animal/Squid.cpp b/targets/minecraft/world/entity/animal/Squid.cpp
index 61fc7d1f5..1186ca0f6 100644
--- a/targets/minecraft/world/entity/animal/Squid.cpp
+++ b/targets/minecraft/world/entity/animal/Squid.cpp
@@ -1,8 +1,10 @@
+#include "Squid.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "Squid.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.cpp b/targets/minecraft/world/entity/animal/VillagerGolem.cpp
index 2a8a75755..55ae94a50 100644
--- a/targets/minecraft/world/entity/animal/VillagerGolem.cpp
+++ b/targets/minecraft/world/entity/animal/VillagerGolem.cpp
@@ -1,18 +1,18 @@
+#include "VillagerGolem.h"
+
 #include <string>
 
-#include "minecraft/world/entity/SyncedEntityData.h"
-#include "VillagerGolem.h"
+#include "java/Random.h"
+#include "minecraft/Pos.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/Pos.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityEvent.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/control/MoveControl.h"
 #include "minecraft/world/entity/ai/goal/GoalSelector.h"
@@ -38,6 +38,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 VillagerGolem::VillagerGolem(Level* level) : Golem(level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.h b/targets/minecraft/world/entity/animal/VillagerGolem.h
index 7d0ce6f73..15ccb1828 100644
--- a/targets/minecraft/world/entity/animal/VillagerGolem.h
+++ b/targets/minecraft/world/entity/animal/VillagerGolem.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Golem.h"
diff --git a/targets/minecraft/world/entity/animal/WaterAnimal.cpp b/targets/minecraft/world/entity/animal/WaterAnimal.cpp
index 20f802f7d..d8fc2d3b6 100644
--- a/targets/minecraft/world/entity/animal/WaterAnimal.cpp
+++ b/targets/minecraft/world/entity/animal/WaterAnimal.cpp
@@ -1,6 +1,7 @@
+#include "WaterAnimal.h"
+
 #include <memory>
 
-#include "WaterAnimal.h"
 #include "java/Random.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/PathfinderMob.h"
diff --git a/targets/minecraft/world/entity/animal/WaterAnimal.h b/targets/minecraft/world/entity/animal/WaterAnimal.h
index 71850e0f9..0cad4e054 100644
--- a/targets/minecraft/world/entity/animal/WaterAnimal.h
+++ b/targets/minecraft/world/entity/animal/WaterAnimal.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/world/entity/PathfinderMob.h"
 #include "minecraft/world/entity/Creature.h"
+#include "minecraft/world/entity/PathfinderMob.h"
 
 class Player;
 class Level;
diff --git a/targets/minecraft/world/entity/animal/Wolf.cpp b/targets/minecraft/world/entity/animal/Wolf.cpp
index 380b0fb64..e48cc0661 100644
--- a/targets/minecraft/world/entity/animal/Wolf.cpp
+++ b/targets/minecraft/world/entity/animal/Wolf.cpp
@@ -1,15 +1,16 @@
+#include "Wolf.h"
+
 #include <math.h>
+
 #include <numbers>
 #include <vector>
 
 #include "Sheep.h"
-#include "Wolf.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/Random.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/SharedConstants.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
@@ -48,6 +49,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/ColoredTile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 Wolf::Wolf(Level* level) : TamableAnimal(level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/animal/Wolf.h b/targets/minecraft/world/entity/animal/Wolf.h
index ea9a9642d..80241f4ae 100644
--- a/targets/minecraft/world/entity/animal/Wolf.h
+++ b/targets/minecraft/world/entity/animal/Wolf.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/TamableAnimal.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/TamableAnimal.h"
 
 class DamageSource;
 class Entity;
diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp
index c32544ce9..53cdc90c2 100644
--- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp
+++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp
@@ -1,6 +1,7 @@
-#include "MultiEntityMob.h"
 #include "MultiEntityMobPart.h"
 
+#include "MultiEntityMob.h"
+
 MultiEntityMobPart::MultiEntityMobPart(
     std::shared_ptr<MultiEntityMob> parentMob, const std::wstring& id, float w,
     float h)
diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.h b/targets/minecraft/world/entity/boss/MultiEntityMobPart.h
index c28db7cff..0bd8d2454 100644
--- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.h
+++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.h
@@ -2,7 +2,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp
index de475d0a8..b286a3817 100644
--- a/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp
+++ b/targets/minecraft/world/entity/boss/enderdragon/EnderCrystal.cpp
@@ -1,10 +1,11 @@
+#include "EnderCrystal.h"
+
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/damageSource/DamageSource.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "net.minecraft.world.entity.boss.enderdragon.h"
-#include "EnderCrystal.h"
-#include "minecraft/world/damageSource/DamageSource.h"
-#include "minecraft/util/Mth.h"
 
 void EnderCrystal::_init(Level* level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp
index b759498c9..36a8a4ae4 100644
--- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp
+++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp
@@ -1,23 +1,24 @@
-#include "minecraft/stdafx.h"
+#include "EnderDragon.h"
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include <cmath>
+#include <limits>
+#include <optional>
+
+#include "minecraft/SharedConstants.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
 #include "minecraft/world/entity/boss/net.minecraft.world.entity.boss.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/pathfinder/net.minecraft.world.level.pathfinder.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/util/Mth.h"
-#include "EnderDragon.h"
-#include <limits>
-#include <optional>
-#include <cmath>
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "net.minecraft.world.entity.boss.enderdragon.h"
 
 #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1
 
diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h
index 4397f13ba..4af80c755 100644
--- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h
+++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "minecraft/stdafx.h"
-
 #include "minecraft/world/entity/boss/BossMob.h"
 #include "minecraft/world/entity/boss/MultiEntityMob.h"
 #include "minecraft/world/entity/monster/Enemy.h"
diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp
index cca117cdf..db8d086bb 100644
--- a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp
+++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp
@@ -1,21 +1,20 @@
-#include "minecraft/world/net.minecraft.world.h"
+#include "WitherBoss.h"
+
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
 #include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h"
 #include "minecraft/world/entity/ai/goal/target/net.minecraft.world.entity.ai.goal.target.h"
 #include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/util/Mth.h"
-
-#include "minecraft/sounds/SoundTypes.h"
-
-#include "WitherBoss.h"
 
 bool LivingEntitySelector::matches(std::shared_ptr<Entity> entity) const {
     if (entity->instanceof(eTYPE_LIVINGENTITY)) {
diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h
index 28e9fe88e..efbe6eef2 100644
--- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h
+++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "minecraft/stdafx.h"
-
+#include "minecraft/world/entity/boss/BossMob.h"
 #include "minecraft/world/entity/monster/Monster.h"
 #include "minecraft/world/entity/monster/RangedAttackMob.h"
-#include "minecraft/world/entity/boss/BossMob.h"
 
 class LivingEntitySelector : public EntitySelector {
 public:
diff --git a/targets/minecraft/world/entity/global/GlobalEntity.h b/targets/minecraft/world/entity/global/GlobalEntity.h
index 685d56546..2247ce7f6 100644
--- a/targets/minecraft/world/entity/global/GlobalEntity.h
+++ b/targets/minecraft/world/entity/global/GlobalEntity.h
@@ -1,6 +1,5 @@
 #pragma once
 #include "minecraft/world/entity/Entity.h"
-#include "minecraft/world/entity/Entity.h"
 
 class Level;
 
diff --git a/targets/minecraft/world/entity/global/LightningBolt.cpp b/targets/minecraft/world/entity/global/LightningBolt.cpp
index 06c251450..3f7e29e96 100644
--- a/targets/minecraft/world/entity/global/LightningBolt.cpp
+++ b/targets/minecraft/world/entity/global/LightningBolt.cpp
@@ -1,13 +1,15 @@
+#include "LightningBolt.h"
+
 #include <math.h>
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "LightningBolt.h"
+#include "java/Random.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/PlayerList.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/global/GlobalEntity.h"
diff --git a/targets/minecraft/world/entity/global/LightningBolt.h b/targets/minecraft/world/entity/global/LightningBolt.h
index 7933a0c24..3d876a9e6 100644
--- a/targets/minecraft/world/entity/global/LightningBolt.h
+++ b/targets/minecraft/world/entity/global/LightningBolt.h
@@ -3,8 +3,8 @@
 #include <stdint.h>
 
 #include "GlobalEntity.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "java/Class.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 class Level;
 
diff --git a/targets/minecraft/world/entity/item/Boat.cpp b/targets/minecraft/world/entity/item/Boat.cpp
index b11a6bd1e..6e711c457 100644
--- a/targets/minecraft/world/entity/item/Boat.cpp
+++ b/targets/minecraft/world/entity/item/Boat.cpp
@@ -1,12 +1,14 @@
+#include "Boat.h"
+
 #include <math.h>
+
 #include <format>
 #include <memory>
 #include <numbers>
 #include <vector>
 
-#include "Boat.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
diff --git a/targets/minecraft/world/entity/item/Boat.h b/targets/minecraft/world/entity/item/Boat.h
index 0cd5c03e6..d712696df 100644
--- a/targets/minecraft/world/entity/item/Boat.h
+++ b/targets/minecraft/world/entity/item/Boat.h
@@ -2,7 +2,6 @@
 
 #include <string>
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/item/FallingTile.cpp b/targets/minecraft/world/entity/item/FallingTile.cpp
index fa48e558d..628bd1bb9 100644
--- a/targets/minecraft/world/entity/item/FallingTile.cpp
+++ b/targets/minecraft/world/entity/item/FallingTile.cpp
@@ -1,14 +1,14 @@
+#include "FallingTile.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <format>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "FallingTile.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/Tag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/item/ItemInstance.h"
@@ -16,6 +16,8 @@
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/Tag.h"
 
 // 4J - added for common ctor code
 void FallingTile::_init() {
diff --git a/targets/minecraft/world/entity/item/FallingTile.h b/targets/minecraft/world/entity/item/FallingTile.h
index 03d7fdd58..13ed763e5 100644
--- a/targets/minecraft/world/entity/item/FallingTile.h
+++ b/targets/minecraft/world/entity/item/FallingTile.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp
index b33e9cd1c..36933cb9a 100644
--- a/targets/minecraft/world/entity/item/ItemEntity.cpp
+++ b/targets/minecraft/world/entity/item/ItemEntity.cpp
@@ -1,15 +1,16 @@
+#include "ItemEntity.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <format>
 #include <numbers>
 #include <vector>
 
-#include "java/JavaMath.h"
-#include "ItemEntity.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -21,6 +22,7 @@
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 void ItemEntity::_init() {
     age = 0;
diff --git a/targets/minecraft/world/entity/item/ItemEntity.h b/targets/minecraft/world/entity/item/ItemEntity.h
index 3fc84da90..54979ef90 100644
--- a/targets/minecraft/world/entity/item/ItemEntity.h
+++ b/targets/minecraft/world/entity/item/ItemEntity.h
@@ -2,8 +2,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/SharedConstants.h"
 #include "java/Class.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/item/Minecart.cpp b/targets/minecraft/world/entity/item/Minecart.cpp
index 746b611a9..f93eceecc 100644
--- a/targets/minecraft/world/entity/item/Minecart.cpp
+++ b/targets/minecraft/world/entity/item/Minecart.cpp
@@ -1,19 +1,20 @@
+#include "Minecart.h"
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <optional>
+
 #include <cmath>
 #include <format>
 #include <memory>
 #include <numbers>
+#include <optional>
 #include <string>
 #include <vector>
 
+#include "java/Class.h"
 #include "minecraft/server/MinecraftServer.h"
 #include "minecraft/server/level/ServerLevel.h"
-#include "Minecart.h"
-#include "java/Class.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
@@ -37,6 +38,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 const int Minecart::EXITS[][2][3] = {
     //
diff --git a/targets/minecraft/world/entity/item/MinecartChest.cpp b/targets/minecraft/world/entity/item/MinecartChest.cpp
index 33b46ca5b..259aa51fc 100644
--- a/targets/minecraft/world/entity/item/MinecartChest.cpp
+++ b/targets/minecraft/world/entity/item/MinecartChest.cpp
@@ -1,4 +1,5 @@
 #include "MinecartChest.h"
+
 #include "minecraft/network/packet/ContainerOpenPacket.h"
 #include "minecraft/world/level/tile/ChestTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp
index 2e07372db..85935493a 100644
--- a/targets/minecraft/world/entity/item/MinecartContainer.cpp
+++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp
@@ -1,10 +1,11 @@
+#include "MinecartContainer.h"
+
 #include "minecraft/stdafx.h"
-#include "net.minecraft.world.entity.item.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h"
-#include "MinecartContainer.h"
+#include "net.minecraft.world.entity.item.h"
 
 void MinecartContainer::_init() {
     items = std::vector<std::shared_ptr<ItemInstance>>(9 * 4);
diff --git a/targets/minecraft/world/entity/item/MinecartFurnace.cpp b/targets/minecraft/world/entity/item/MinecartFurnace.cpp
index 65ffbc2f6..954d6a258 100644
--- a/targets/minecraft/world/entity/item/MinecartFurnace.cpp
+++ b/targets/minecraft/world/entity/item/MinecartFurnace.cpp
@@ -1,12 +1,13 @@
+#include "MinecartFurnace.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "MinecartFurnace.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/network/packet/ContainerOpenPacket.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -18,6 +19,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
 
 MinecartFurnace::MinecartFurnace(Level* level) : Minecart(level) {
     defineSynchedData();
diff --git a/targets/minecraft/world/entity/item/MinecartHopper.cpp b/targets/minecraft/world/entity/item/MinecartHopper.cpp
index 0e398baec..a5f3f9a0e 100644
--- a/targets/minecraft/world/entity/item/MinecartHopper.cpp
+++ b/targets/minecraft/world/entity/item/MinecartHopper.cpp
@@ -1,11 +1,11 @@
 
+#include "minecraft/world/entity/item/MinecartHopper.h"
+
 #include <format>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/entity/item/MinecartHopper.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/entity/EntitySelector.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/item/MinecartContainer.h"
@@ -16,6 +16,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/HopperTileEntity.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 class Entity;
 
diff --git a/targets/minecraft/world/entity/item/MinecartRideable.cpp b/targets/minecraft/world/entity/item/MinecartRideable.cpp
index e8f8c9de1..a6b864ae0 100644
--- a/targets/minecraft/world/entity/item/MinecartRideable.cpp
+++ b/targets/minecraft/world/entity/item/MinecartRideable.cpp
@@ -1,6 +1,7 @@
+#include "MinecartRideable.h"
+
 #include <memory>
 
-#include "MinecartRideable.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/item/MinecartSpawner.cpp b/targets/minecraft/world/entity/item/MinecartSpawner.cpp
index 34f45031a..23d9ea651 100644
--- a/targets/minecraft/world/entity/item/MinecartSpawner.cpp
+++ b/targets/minecraft/world/entity/item/MinecartSpawner.cpp
@@ -1,4 +1,5 @@
 #include "MinecartSpawner.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/entity/item/MinecartSpawner.h b/targets/minecraft/world/entity/item/MinecartSpawner.h
index 7bb97c1c3..8d9ca6d1b 100644
--- a/targets/minecraft/world/entity/item/MinecartSpawner.h
+++ b/targets/minecraft/world/entity/item/MinecartSpawner.h
@@ -3,9 +3,9 @@
 #include <stdint.h>
 
 #include "Minecart.h"
-#include "minecraft/world/level/BaseMobSpawner.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/item/Minecart.h"
+#include "minecraft/world/level/BaseMobSpawner.h"
 
 class Entity;
 class Level;
diff --git a/targets/minecraft/world/entity/item/MinecartTNT.cpp b/targets/minecraft/world/entity/item/MinecartTNT.cpp
index cc360563e..35271587a 100644
--- a/targets/minecraft/world/entity/item/MinecartTNT.cpp
+++ b/targets/minecraft/world/entity/item/MinecartTNT.cpp
@@ -1,17 +1,19 @@
+#include "MinecartTNT.h"
+
 #include <math.h>
+
 #include <memory>
 #include <string>
 
-#include "MinecartTNT.h"
+#include "java/Random.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/BaseRailTile.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
 
 void MinecartTNT::_init() {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/item/PrimedTnt.cpp b/targets/minecraft/world/entity/item/PrimedTnt.cpp
index 8d0f36f64..6a3d406fd 100644
--- a/targets/minecraft/world/entity/item/PrimedTnt.cpp
+++ b/targets/minecraft/world/entity/item/PrimedTnt.cpp
@@ -1,13 +1,15 @@
+#include "PrimedTnt.h"
+
 #include <stdint.h>
+
 #include <cmath>
 #include <numbers>
 #include <string>
 
 #include "java/JavaMath.h"
-#include "PrimedTnt.h"
 #include "minecraft/core/particles/ParticleTypes.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 void PrimedTnt::_init() {
     life = 0;
diff --git a/targets/minecraft/world/entity/item/PrimedTnt.h b/targets/minecraft/world/entity/item/PrimedTnt.h
index 7aad365bb..e6530413e 100644
--- a/targets/minecraft/world/entity/item/PrimedTnt.h
+++ b/targets/minecraft/world/entity/item/PrimedTnt.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <memory>
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h b/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h
index 575f18b52..8b797ad14 100644
--- a/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h
+++ b/targets/minecraft/world/entity/item/net.minecraft.world.entity.item.h
@@ -6,8 +6,8 @@
 #include "Minecart.h"
 #include "MinecartChest.h"
 #include "MinecartContainer.h"
-#include "MinecartHopper.h"
 #include "MinecartFurnace.h"
+#include "MinecartHopper.h"
 #include "MinecartRideable.h"
 #include "MinecartSpawner.h"
 #include "MinecartTNT.h"
diff --git a/targets/minecraft/world/entity/monster/Blaze.cpp b/targets/minecraft/world/entity/monster/Blaze.cpp
index d87439f90..29a11762d 100644
--- a/targets/minecraft/world/entity/monster/Blaze.cpp
+++ b/targets/minecraft/world/entity/monster/Blaze.cpp
@@ -1,13 +1,15 @@
+#include "Blaze.h"
+
 #include <stdint.h>
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
-#include "Blaze.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/entity/monster/CaveSpider.cpp b/targets/minecraft/world/entity/monster/CaveSpider.cpp
index 0018cdc9b..7ac2661e6 100644
--- a/targets/minecraft/world/entity/monster/CaveSpider.cpp
+++ b/targets/minecraft/world/entity/monster/CaveSpider.cpp
@@ -1,6 +1,7 @@
+#include "CaveSpider.h"
+
 #include <memory>
 
-#include "CaveSpider.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/effect/MobEffect.h"
diff --git a/targets/minecraft/world/entity/monster/Creeper.cpp b/targets/minecraft/world/entity/monster/Creeper.cpp
index 98b997b28..b37050c35 100644
--- a/targets/minecraft/world/entity/monster/Creeper.cpp
+++ b/targets/minecraft/world/entity/monster/Creeper.cpp
@@ -1,11 +1,12 @@
+#include "Creeper.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "Creeper.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
@@ -28,6 +29,7 @@
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/GameRules.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 void Creeper::_init() {
     swell = 0;
diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp
index d6b92ecc0..56c35c712 100644
--- a/targets/minecraft/world/entity/monster/EnderMan.cpp
+++ b/targets/minecraft/world/entity/monster/EnderMan.cpp
@@ -1,15 +1,16 @@
+#include "EnderMan.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "EnderMan.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/Random.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
@@ -30,6 +31,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 AttributeModifier* EnderMan::SPEED_MODIFIER_ATTACKING =
     (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f,
diff --git a/targets/minecraft/world/entity/monster/Enemy.cpp b/targets/minecraft/world/entity/monster/Enemy.cpp
index 45dfc19f3..2287f73d3 100644
--- a/targets/minecraft/world/entity/monster/Enemy.cpp
+++ b/targets/minecraft/world/entity/monster/Enemy.cpp
@@ -1,6 +1,7 @@
+#include "Enemy.h"
+
 #include <memory>
 
-#include "Enemy.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/monster/Ghast.cpp b/targets/minecraft/world/entity/monster/Ghast.cpp
index bfbb738b9..4550f5b87 100644
--- a/targets/minecraft/world/entity/monster/Ghast.cpp
+++ b/targets/minecraft/world/entity/monster/Ghast.cpp
@@ -1,15 +1,15 @@
+#include "Ghast.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <numbers>
 #include <string>
 #include <vector>
 
-#include "Ghast.h"
-#include "minecraft/world/level/tile/LevelEvent.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/network/packet/ChatPacket.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -24,8 +24,10 @@
 #include "minecraft/world/entity/projectile/LargeFireball.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 void Ghast::_init() {
     explosionPower = 1;
diff --git a/targets/minecraft/world/entity/monster/Ghast.h b/targets/minecraft/world/entity/monster/Ghast.h
index 5c9784039..5726b4a74 100644
--- a/targets/minecraft/world/entity/monster/Ghast.h
+++ b/targets/minecraft/world/entity/monster/Ghast.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "minecraft/world/entity/FlyingMob.h"
 #include "Enemy.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/FlyingMob.h"
 
 class GhastClass;
 class Level;
diff --git a/targets/minecraft/world/entity/monster/Giant.cpp b/targets/minecraft/world/entity/monster/Giant.cpp
index ac3c55e69..6fb4236be 100644
--- a/targets/minecraft/world/entity/monster/Giant.cpp
+++ b/targets/minecraft/world/entity/monster/Giant.cpp
@@ -1,4 +1,5 @@
 #include "Giant.h"
+
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/monster/Monster.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
diff --git a/targets/minecraft/world/entity/monster/LavaSlime.cpp b/targets/minecraft/world/entity/monster/LavaSlime.cpp
index 40cea8fa2..5ea2904af 100644
--- a/targets/minecraft/world/entity/monster/LavaSlime.cpp
+++ b/targets/minecraft/world/entity/monster/LavaSlime.cpp
@@ -1,9 +1,10 @@
+#include "LavaSlime.h"
+
 #include <memory>
 #include <vector>
 
-#include "LavaSlime.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
diff --git a/targets/minecraft/world/entity/monster/LavaSlime.h b/targets/minecraft/world/entity/monster/LavaSlime.h
index d3c7df24f..f989cbbd6 100644
--- a/targets/minecraft/world/entity/monster/LavaSlime.h
+++ b/targets/minecraft/world/entity/monster/LavaSlime.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Slime.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 
 class Entity;
 class Level;
diff --git a/targets/minecraft/world/entity/monster/Monster.cpp b/targets/minecraft/world/entity/monster/Monster.cpp
index 26ee4fa97..9b824540c 100644
--- a/targets/minecraft/world/entity/monster/Monster.cpp
+++ b/targets/minecraft/world/entity/monster/Monster.cpp
@@ -1,11 +1,13 @@
+#include "Monster.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 
-#include "Monster.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
diff --git a/targets/minecraft/world/entity/monster/Monster.h b/targets/minecraft/world/entity/monster/Monster.h
index 64de32c60..cccea5888 100644
--- a/targets/minecraft/world/entity/monster/Monster.h
+++ b/targets/minecraft/world/entity/monster/Monster.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "minecraft/world/entity/PathfinderMob.h"
 #include "Enemy.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/PathfinderMob.h"
 
 class Level;
 class CompoundTag;
diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp
index 58b5772e3..790aba577 100644
--- a/targets/minecraft/world/entity/monster/PigZombie.cpp
+++ b/targets/minecraft/world/entity/monster/PigZombie.cpp
@@ -1,12 +1,12 @@
+#include "PigZombie.h"
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "PigZombie.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
@@ -19,6 +19,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 AttributeModifier* PigZombie::SPEED_MODIFIER_ATTACKING =
     (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45,
diff --git a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp
index a9afb04a2..0176714a4 100644
--- a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp
+++ b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp
@@ -1,18 +1,19 @@
+#include "SharedMonsterAttributes.h"
+
 #include <limits>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
-#include "SharedMonsterAttributes.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
 #include "minecraft/world/entity/ai/attributes/AttributeInstance.h"
 #include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
 #include "minecraft/world/entity/ai/attributes/BaseAttribute.h"
 #include "minecraft/world/entity/ai/attributes/BaseAttributeMap.h"
 #include "minecraft/world/entity/ai/attributes/RangedAttribute.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 Attribute* SharedMonsterAttributes::MAX_HEALTH =
     (new RangedAttribute(eAttributeId_GENERIC_MAXHEALTH, 20, 0,
diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp
index 0843e750a..7481476ef 100644
--- a/targets/minecraft/world/entity/monster/Silverfish.cpp
+++ b/targets/minecraft/world/entity/monster/Silverfish.cpp
@@ -1,10 +1,11 @@
+#include "Silverfish.h"
+
 #include <memory>
 
-#include "Silverfish.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/damageSource/EntityDamageSource.h"
diff --git a/targets/minecraft/world/entity/monster/Skeleton.cpp b/targets/minecraft/world/entity/monster/Skeleton.cpp
index 04e47a85c..622043506 100644
--- a/targets/minecraft/world/entity/monster/Skeleton.cpp
+++ b/targets/minecraft/world/entity/monster/Skeleton.cpp
@@ -1,14 +1,15 @@
+#include "Skeleton.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "Skeleton.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -45,6 +46,7 @@
 #include "minecraft/world/level/dimension/HellDimension.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/SkullTileEntity.h"
+#include "nbt/CompoundTag.h"
 
 Skeleton::Skeleton(Level* level) : Monster(level) {
     // 4J Stu - This function call had to be moved here from the Entity ctor to
diff --git a/targets/minecraft/world/entity/monster/Slime.cpp b/targets/minecraft/world/entity/monster/Slime.cpp
index 0b9f6f4f0..1fd0b4a0b 100644
--- a/targets/minecraft/world/entity/monster/Slime.cpp
+++ b/targets/minecraft/world/entity/monster/Slime.cpp
@@ -1,13 +1,14 @@
+#include "Slime.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <numbers>
 #include <string>
 
-#include "Slime.h"
+#include "java/Random.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -22,6 +23,7 @@
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 void Slime::_init() {
     jumpDelay = 0;
diff --git a/targets/minecraft/world/entity/monster/Slime.h b/targets/minecraft/world/entity/monster/Slime.h
index 04dd62b14..e95b23dc8 100644
--- a/targets/minecraft/world/entity/monster/Slime.h
+++ b/targets/minecraft/world/entity/monster/Slime.h
@@ -2,10 +2,9 @@
 
 #include <memory>
 
-#include "minecraft/world/entity/Mob.h"
 #include "Enemy.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/Mob.h"
 
 class Entity;
diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp
index afbae0045..8466b7519 100644
--- a/targets/minecraft/world/entity/monster/Spider.cpp
+++ b/targets/minecraft/world/entity/monster/Spider.cpp
@@ -1,12 +1,14 @@
+#include "Spider.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <limits>
 #include <memory>
 
-#include "Spider.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
diff --git a/targets/minecraft/world/entity/monster/Spider.h b/targets/minecraft/world/entity/monster/Spider.h
index 94e675c25..b45ae25c4 100644
--- a/targets/minecraft/world/entity/monster/Spider.h
+++ b/targets/minecraft/world/entity/monster/Spider.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Monster.h"
-#include "minecraft/world/entity/MobGroupData.h"
 #include "java/Class.h"
+#include "minecraft/world/entity/MobGroupData.h"
 #include "minecraft/world/entity/MobType.h"
 
 class Entity;
diff --git a/targets/minecraft/world/entity/monster/Witch.cpp b/targets/minecraft/world/entity/monster/Witch.cpp
index 00347d6e0..39b150490 100644
--- a/targets/minecraft/world/entity/monster/Witch.cpp
+++ b/targets/minecraft/world/entity/monster/Witch.cpp
@@ -1,12 +1,13 @@
+#include "Witch.h"
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "Witch.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/effect/MobEffect.h"
diff --git a/targets/minecraft/world/entity/monster/Zombie.cpp b/targets/minecraft/world/entity/monster/Zombie.cpp
index 2eaf8841d..17b826db4 100644
--- a/targets/minecraft/world/entity/monster/Zombie.cpp
+++ b/targets/minecraft/world/entity/monster/Zombie.cpp
@@ -1,14 +1,15 @@
+#include "Zombie.h"
+
 #include <math.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "Zombie.h"
-#include "minecraft/stats/GenericStats.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -48,6 +49,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
 
 Attribute* Zombie::SPAWN_REINFORCEMENTS_CHANCE =
     (new RangedAttribute(eAttributeId_ZOMBIE_SPAWNREINFORCEMENTS, 0, 0, 1));
diff --git a/targets/minecraft/world/entity/monster/Zombie.h b/targets/minecraft/world/entity/monster/Zombie.h
index f6dd67676..5ccbff93d 100644
--- a/targets/minecraft/world/entity/monster/Zombie.h
+++ b/targets/minecraft/world/entity/monster/Zombie.h
@@ -3,10 +3,9 @@
 #include <stdint.h>
 
 #include "Monster.h"
-#include "minecraft/SharedConstants.h"
-#include "minecraft/world/entity/MobGroupData.h"
 #include "java/Class.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/world/entity/MobGroupData.h"
 #include "minecraft/world/entity/MobType.h"
 
 class Attribute;
diff --git a/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h b/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h
index edeaf9259..4ef4336dd 100644
--- a/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h
+++ b/targets/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "Enemy.h"
-#include "Monster.h"
 #include "Creeper.h"
+#include "Enemy.h"
 #include "Ghast.h"
 #include "Giant.h"
-#include "Zombie.h"
+#include "Monster.h"
 #include "PigZombie.h"
 #include "Skeleton.h"
 #include "Slime.h"
 #include "Spider.h"
+#include "Zombie.h"
 
 // 1.8.2
 #include "CaveSpider.h"
diff --git a/targets/minecraft/world/entity/net.minecraft.world.entity.h b/targets/minecraft/world/entity/net.minecraft.world.entity.h
index 8b6a7e0dd..534103de1 100644
--- a/targets/minecraft/world/entity/net.minecraft.world.entity.h
+++ b/targets/minecraft/world/entity/net.minecraft.world.entity.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Creature.h"
-#include "SyncedEntityData.h"
 #include "Entity.h"
 #include "EntityEvent.h"
 #include "EntityIO.h"
@@ -11,6 +10,7 @@
 #include "MobCategory.h"
 #include "Painting.h"
 #include "PathfinderMob.h"
+#include "SyncedEntityData.h"
 
 // 1.8.2
 #include "DelayedRelease.h"
@@ -27,8 +27,8 @@
 #include "TamableAnimal.h"
 
 // 1.6.4
-#include "LeashFenceKnotEntity.h"
-#include "MobGroupData.h"
-#include "OwnableEntity.h"
 #include "EntitySelector.h"
-#include "LivingEntity.h"
\ No newline at end of file
+#include "LeashFenceKnotEntity.h"
+#include "LivingEntity.h"
+#include "MobGroupData.h"
+#include "OwnableEntity.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp
index 3a225ddcc..bd048da23 100644
--- a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp
+++ b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp
@@ -1,4 +1,5 @@
 #include "ClientSideMerchant.h"
+
 #include "minecraft/world/inventory/MerchantContainer.h"
 #include "minecraft/world/item/trading/MerchantRecipe.h"
 #include "minecraft/world/item/trading/MerchantRecipeList.h"
diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp
index 9c580aa8e..26bd8c967 100644
--- a/targets/minecraft/world/entity/npc/Villager.cpp
+++ b/targets/minecraft/world/entity/npc/Villager.cpp
@@ -1,23 +1,23 @@
-#include "minecraft/stdafx.h"
+#include "Villager.h"
 
-#include "nbt/com.mojang.nbt.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
 #include "minecraft/world/entity/ai/goal/net.minecraft.world.entity.ai.goal.h"
 #include "minecraft/world/entity/ai/navigation/net.minecraft.world.entity.ai.navigation.h"
 #include "minecraft/world/entity/ai/village/net.minecraft.world.entity.ai.village.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/item/trading/net.minecraft.world.item.trading.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/util/Mth.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "Villager.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "nbt/com.mojang.nbt.h"
 
 namespace {
 struct VillagerShuffleRandom {
diff --git a/targets/minecraft/world/entity/npc/Villager.h b/targets/minecraft/world/entity/npc/Villager.h
index 2d506cf27..430fe3fd2 100644
--- a/targets/minecraft/world/entity/npc/Villager.h
+++ b/targets/minecraft/world/entity/npc/Villager.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "minecraft/world/entity/AgeableMob.h"
 #include "Npc.h"
-#include "minecraft/world/item/trading/Merchant.h"
 #include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/entity/AgeableMob.h"
+#include "minecraft/world/item/trading/Merchant.h"
 
 class Level;
 class Village;
diff --git a/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h b/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h
index 2874bcd7f..90c1258a8 100644
--- a/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h
+++ b/targets/minecraft/world/entity/npc/net.minecraft.world.entity.npc.h
@@ -1,5 +1,5 @@
 #pragma once
 
+#include "ClientSideMerchant.h"
 #include "Npc.h"
-#include "Villager.h"
-#include "ClientSideMerchant.h"
\ No newline at end of file
+#include "Villager.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/player/Abilities.cpp b/targets/minecraft/world/entity/player/Abilities.cpp
index 86f5bc635..7ea8b1726 100644
--- a/targets/minecraft/world/entity/player/Abilities.cpp
+++ b/targets/minecraft/world/entity/player/Abilities.cpp
@@ -1,6 +1,7 @@
+#include "Abilities.h"
+
 #include <string>
 
-#include "Abilities.h"
 #include "nbt/CompoundTag.h"
 
 Abilities::Abilities() {
diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp
index 61111cff9..b09c2fa3b 100644
--- a/targets/minecraft/world/entity/player/Inventory.cpp
+++ b/targets/minecraft/world/entity/player/Inventory.cpp
@@ -1,10 +1,11 @@
+#include "Inventory.h"
+
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "nbt/com.mojang.nbt.h"
 #include "net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/level/material/Material.h"
-#include "Inventory.h"
 
 const int Inventory::POP_TIME_DURATION = 5;
 const int Inventory::MAX_INVENTORY_STACK_SIZE = 64;
diff --git a/targets/minecraft/world/entity/player/Inventory.h b/targets/minecraft/world/entity/player/Inventory.h
index 2edd75e11..7b61aa727 100644
--- a/targets/minecraft/world/entity/player/Inventory.h
+++ b/targets/minecraft/world/entity/player/Inventory.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "minecraft/world/Container.h"
-#include "nbt/ListTag.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "nbt/ListTag.h"
 
 class Player;
 class CompoundTag;
diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp
index 11abf3038..1b0aad26f 100644
--- a/targets/minecraft/world/entity/player/Player.cpp
+++ b/targets/minecraft/world/entity/player/Player.cpp
@@ -7,36 +7,38 @@
 // derives from, and not to find the derived class itself (which should own the
 // virtual GetType function)
 
+#include "Player.h"
+
 #include <limits.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <string>
+
 #include <algorithm>
 #include <cmath>
 #include <numbers>
 #include <sstream>
+#include <string>
 #include <vector>
 
-#include "java/JavaMath.h"
 #include "Inventory.h"
-#include "Player.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/client/renderer/Textures.h"
-#include "minecraft/client/model/HumanoidModel.h"
-#include "minecraft/world/entity/player/Player.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/App_structs.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Pos.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/model/HumanoidModel.h"
+#include "minecraft/client/renderer/Textures.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
@@ -56,6 +58,7 @@
 #include "minecraft/world/entity/monster/Monster.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "minecraft/world/entity/player/Abilities.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/Arrow.h"
 #include "minecraft/world/food/FoodConstants.h"
 #include "minecraft/world/food/FoodData.h"
@@ -82,9 +85,8 @@
 #include "minecraft/world/scores/Scoreboard.h"
 #include "minecraft/world/scores/Team.h"
 #include "minecraft/world/scores/criteria/ObjectiveCriteria.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 class ModelPart;
 class Objective;
diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h
index 81a90b1e4..67efc5696 100644
--- a/targets/minecraft/world/entity/player/Player.h
+++ b/targets/minecraft/world/entity/player/Player.h
@@ -5,20 +5,18 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/LivingEntity.h"
-#include "console_helpers/Definitions.h"
-#include "Abilities.h"
-#include "minecraft/world/food/FoodData.h"
-#include "minecraft/world/inventory/PlayerEnderChestContainer.h"
-#include "minecraft/commands/CommandSender.h"
-#include "minecraft/world/scores/ScoreHolder.h"
 #include "4J.Common/4J_Compat.h"
+#include "Abilities.h"
 #include "console_helpers/Definitions.h"
 #include "java/Class.h"
+#include "minecraft/commands/CommandSender.h"
 #include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/food/FoodData.h"
+#include "minecraft/world/inventory/PlayerEnderChestContainer.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/scores/ScoreHolder.h"
 
 class AbstractContainerMenu;
 class Stats;
diff --git a/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h b/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h
index 9394b89bd..3e78834c6 100644
--- a/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h
+++ b/targets/minecraft/world/entity/player/net.minecraft.world.entity.player.h
@@ -1,5 +1,5 @@
 #pragma once
 
+#include "Abilities.h"
 #include "Inventory.h"
-#include "Player.h"
-#include "Abilities.h"
\ No newline at end of file
+#include "Player.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp
index 64a8231e5..7b8ae0518 100644
--- a/targets/minecraft/world/entity/projectile/Arrow.cpp
+++ b/targets/minecraft/world/entity/projectile/Arrow.cpp
@@ -1,20 +1,21 @@
+#include "Arrow.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <format>
 #include <numbers>
 #include <optional>
 #include <string>
 #include <vector>
 
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/network/packet/GameEventPacket.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/server/network/PlayerConnection.h"
-#include "Arrow.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/network/packet/GameEventPacket.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
@@ -31,6 +32,7 @@
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 // base damage, multiplied with velocity
 const double Arrow::ARROW_BASE_DAMAGE = 2.0f;
diff --git a/targets/minecraft/world/entity/projectile/Arrow.h b/targets/minecraft/world/entity/projectile/Arrow.h
index d7e5ffb02..f364ad453 100644
--- a/targets/minecraft/world/entity/projectile/Arrow.h
+++ b/targets/minecraft/world/entity/projectile/Arrow.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include "minecraft/world/entity/Entity.h"
 #include "Projectile.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/projectile/DragonFireball.cpp b/targets/minecraft/world/entity/projectile/DragonFireball.cpp
index 4f8f23951..297041f57 100644
--- a/targets/minecraft/world/entity/projectile/DragonFireball.cpp
+++ b/targets/minecraft/world/entity/projectile/DragonFireball.cpp
@@ -1,9 +1,11 @@
+#include "DragonFireball.h"
+
 #include <math.h>
+
 #include <format>
 #include <vector>
 
 #include "java/JavaMath.h"
-#include "DragonFireball.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/projectile/Fireball.h"
diff --git a/targets/minecraft/world/entity/projectile/DragonFireball.h b/targets/minecraft/world/entity/projectile/DragonFireball.h
index a64e382a2..5544b396c 100644
--- a/targets/minecraft/world/entity/projectile/DragonFireball.h
+++ b/targets/minecraft/world/entity/projectile/DragonFireball.h
@@ -3,8 +3,8 @@
 #include <memory>
 
 #include "Fireball.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 
 class HitResult;
 class Entity;
diff --git a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp
index ed71ed72d..37a0aea41 100644
--- a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp
+++ b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp
@@ -1,12 +1,13 @@
+#include "EyeOfEnderSignal.h"
+
 #include <cmath>
 #include <memory>
 #include <numbers>
 
 #include "java/JavaMath.h"
-#include "EyeOfEnderSignal.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.h b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.h
index ec528fe5d..909c039f7 100644
--- a/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.h
+++ b/targets/minecraft/world/entity/projectile/EyeOfEnderSignal.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp
index d6717d507..118ab3c6a 100644
--- a/targets/minecraft/world/entity/projectile/Fireball.cpp
+++ b/targets/minecraft/world/entity/projectile/Fireball.cpp
@@ -1,5 +1,8 @@
+#include "Fireball.h"
+
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <cmath>
 #include <format>
 #include <numbers>
@@ -7,14 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "Fireball.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/DoubleTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/level/Level.h"
@@ -22,6 +21,9 @@
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/DoubleTag.h"
+#include "nbt/ListTag.h"
 
 // 4J - added common ctor code.
 void Fireball::_init() {
diff --git a/targets/minecraft/world/entity/projectile/Fireball.h b/targets/minecraft/world/entity/projectile/Fireball.h
index a75cd542f..4b49e9346 100644
--- a/targets/minecraft/world/entity/projectile/Fireball.h
+++ b/targets/minecraft/world/entity/projectile/Fireball.h
@@ -2,9 +2,8 @@
 
 #include <memory>
 
-#include "minecraft/world/entity/Entity.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/Entity.h"
 
 class HitResult;
diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp
index a644fa451..5622d71f8 100644
--- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp
+++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp
@@ -1,19 +1,21 @@
+#include "FireworksRocketEntity.h"
+
 #include <math.h>
+
 #include <numbers>
 #include <string>
 
-#include "FireworksRocketEntity.h"
+#include "java/Random.h"
+#include "minecraft/SharedConstants.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/SharedConstants.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/EntityEvent.h"
 #include "minecraft/world/entity/SyncedEntityData.h"
 #include "minecraft/world/item/FireworksItem.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 FireworksRocketEntity::FireworksRocketEntity(Level* level) : Entity(level) {
     defineSynchedData();
diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h
index 9203c553e..c047cdc7b 100644
--- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h
+++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/projectile/FishingHook.cpp b/targets/minecraft/world/entity/projectile/FishingHook.cpp
index 1f2bffd37..0efb5a7fc 100644
--- a/targets/minecraft/world/entity/projectile/FishingHook.cpp
+++ b/targets/minecraft/world/entity/projectile/FishingHook.cpp
@@ -1,15 +1,16 @@
+#include "FishingHook.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <format>
 #include <numbers>
 #include <string>
 #include <vector>
 
-#include "FishingHook.h"
+#include "java/Random.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/ExperienceOrb.h"
@@ -23,6 +24,7 @@
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 // 4J - added common ctor code.
 void FishingHook::_init() {
diff --git a/targets/minecraft/world/entity/projectile/FishingHook.h b/targets/minecraft/world/entity/projectile/FishingHook.h
index f32dcc877..b89042a02 100644
--- a/targets/minecraft/world/entity/projectile/FishingHook.h
+++ b/targets/minecraft/world/entity/projectile/FishingHook.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/entity/projectile/LargeFireball.cpp b/targets/minecraft/world/entity/projectile/LargeFireball.cpp
index 8b64875cc..02de91210 100644
--- a/targets/minecraft/world/entity/projectile/LargeFireball.cpp
+++ b/targets/minecraft/world/entity/projectile/LargeFireball.cpp
@@ -1,7 +1,7 @@
+#include "LargeFireball.h"
+
 #include <string>
 
-#include "LargeFireball.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
@@ -9,6 +9,7 @@
 #include "minecraft/world/level/GameRules.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/phys/HitResult.h"
+#include "nbt/CompoundTag.h"
 
 LargeFireball::LargeFireball(Level* level) : Fireball(level) {
     explosionPower = 1;
diff --git a/targets/minecraft/world/entity/projectile/SmallFireball.cpp b/targets/minecraft/world/entity/projectile/SmallFireball.cpp
index c19a8b801..e17e844dc 100644
--- a/targets/minecraft/world/entity/projectile/SmallFireball.cpp
+++ b/targets/minecraft/world/entity/projectile/SmallFireball.cpp
@@ -1,4 +1,5 @@
 #include "SmallFireball.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/projectile/Snowball.cpp b/targets/minecraft/world/entity/projectile/Snowball.cpp
index cb6df0a9f..787846ef3 100644
--- a/targets/minecraft/world/entity/projectile/Snowball.cpp
+++ b/targets/minecraft/world/entity/projectile/Snowball.cpp
@@ -1,4 +1,5 @@
 #include "Snowball.h"
+
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/entity/projectile/Throwable.cpp b/targets/minecraft/world/entity/projectile/Throwable.cpp
index 9c3e747ac..39ae5d76e 100644
--- a/targets/minecraft/world/entity/projectile/Throwable.cpp
+++ b/targets/minecraft/world/entity/projectile/Throwable.cpp
@@ -1,20 +1,22 @@
+#include "Throwable.h"
+
 #include <math.h>
 #include <stdint.h>
+
 #include <format>
 #include <numbers>
 #include <vector>
 
-#include "Throwable.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
+#include "nbt/CompoundTag.h"
 
 void Throwable::_throwableInit() {
     xTile = -1;
diff --git a/targets/minecraft/world/entity/projectile/Throwable.h b/targets/minecraft/world/entity/projectile/Throwable.h
index e331636c7..01db70537 100644
--- a/targets/minecraft/world/entity/projectile/Throwable.h
+++ b/targets/minecraft/world/entity/projectile/Throwable.h
@@ -3,7 +3,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/entity/Entity.h"
 #include "Projectile.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp
index 38a4f3f70..c81731e8d 100644
--- a/targets/minecraft/world/entity/projectile/ThrownEgg.cpp
+++ b/targets/minecraft/world/entity/projectile/ThrownEgg.cpp
@@ -1,6 +1,7 @@
 #include "ThrownEgg.h"
-#include "minecraft/core/particles/ParticleTypes.h"
+
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp
index cf57d7087..0ada74647 100644
--- a/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp
+++ b/targets/minecraft/world/entity/projectile/ThrownEnderpearl.cpp
@@ -1,8 +1,9 @@
+#include "ThrownEnderpearl.h"
+
+#include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/server/network/PlayerConnection.h"
-#include "ThrownEnderpearl.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "java/Random.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp b/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp
index 435b5a6cf..4c367794b 100644
--- a/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp
+++ b/targets/minecraft/world/entity/projectile/ThrownExpBottle.cpp
@@ -1,5 +1,6 @@
-#include "java/JavaMath.h"
 #include "ThrownExpBottle.h"
+
+#include "java/JavaMath.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/ExperienceOrb.h"
 #include "minecraft/world/entity/projectile/Throwable.h"
diff --git a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp
index 2dffe20fc..f421bf8df 100644
--- a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp
+++ b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp
@@ -1,11 +1,12 @@
+#include "ThrownPotion.h"
+
 #include <math.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
 #include "java/JavaMath.h"
-#include "ThrownPotion.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/effect/MobEffect.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
@@ -18,6 +19,7 @@
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/HitResult.h"
+#include "nbt/CompoundTag.h"
 
 class Entity;
 
diff --git a/targets/minecraft/world/entity/projectile/WitherSkull.cpp b/targets/minecraft/world/entity/projectile/WitherSkull.cpp
index 771fbb141..e1646e35e 100644
--- a/targets/minecraft/world/entity/projectile/WitherSkull.cpp
+++ b/targets/minecraft/world/entity/projectile/WitherSkull.cpp
@@ -1,7 +1,9 @@
+#include "WitherSkull.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 
-#include "WitherSkull.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
diff --git a/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h b/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h
index aa10571e0..814bce5bf 100644
--- a/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h
+++ b/targets/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h
@@ -11,8 +11,8 @@
 #include "SmallFireball.h"
 #include "Throwable.h"
 #include "ThrownEnderpearl.h"
-#include "ThrownPotion.h"
 #include "ThrownExpBottle.h"  // Brought forward from 1.2
+#include "ThrownPotion.h"
 
 // Added TU 9
 #include "DragonFireball.h"
diff --git a/targets/minecraft/world/food/FoodData.cpp b/targets/minecraft/world/food/FoodData.cpp
index 733521d8f..5285f7972 100644
--- a/targets/minecraft/world/food/FoodData.cpp
+++ b/targets/minecraft/world/food/FoodData.cpp
@@ -1,16 +1,17 @@
+#include "FoodData.h"
+
 #include <algorithm>
 #include <string>
 
 #include "FoodConstants.h"
-#include "FoodData.h"
-#include "minecraft/world/food/FoodData.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/Difficulty.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "minecraft/world/food/FoodData.h"
 #include "minecraft/world/item/FoodItem.h"
 #include "minecraft/world/level/GameRules.h"
 #include "minecraft/world/level/Level.h"
+#include "nbt/CompoundTag.h"
 
 FoodData::FoodData() {
     exhaustionLevel = 0;
diff --git a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp
index 426a15c5e..0542a61b6 100644
--- a/targets/minecraft/world/inventory/AbstractContainerMenu.cpp
+++ b/targets/minecraft/world/inventory/AbstractContainerMenu.cpp
@@ -1,7 +1,8 @@
+#include "AbstractContainerMenu.h"
+
 #include <algorithm>
 
 #include "Slot.h"
-#include "AbstractContainerMenu.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Abilities.h"
diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp
index 3cd4ecc74..2e8407bb3 100644
--- a/targets/minecraft/world/inventory/AnvilMenu.cpp
+++ b/targets/minecraft/world/inventory/AnvilMenu.cpp
@@ -1,13 +1,13 @@
-#include "minecraft/stdafx.h"
-
-#include "net.minecraft.world.inventory.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
-#include "console_helpers/StringHelpers.h"
 #include "AnvilMenu.h"
 
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "net.minecraft.world.inventory.h"
+
 AnvilMenu::AnvilMenu(std::shared_ptr<Inventory> inventory, Level* level, int xt,
                      int yt, int zt, std::shared_ptr<Player> player) {
     resultSlots = std::make_shared<ResultContainer>();
diff --git a/targets/minecraft/world/inventory/ArmorSlot.cpp b/targets/minecraft/world/inventory/ArmorSlot.cpp
index 6fa91cf94..e150faaf3 100644
--- a/targets/minecraft/world/inventory/ArmorSlot.cpp
+++ b/targets/minecraft/world/inventory/ArmorSlot.cpp
@@ -1,4 +1,5 @@
 #include "ArmorSlot.h"
+
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ArmorItem.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/inventory/BeaconMenu.cpp b/targets/minecraft/world/inventory/BeaconMenu.cpp
index 0571cb349..ea9d87753 100644
--- a/targets/minecraft/world/inventory/BeaconMenu.cpp
+++ b/targets/minecraft/world/inventory/BeaconMenu.cpp
@@ -1,6 +1,7 @@
+#include "BeaconMenu.h"
+
 #include <vector>
 
-#include "BeaconMenu.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h"
diff --git a/targets/minecraft/world/inventory/BrewingStandMenu.cpp b/targets/minecraft/world/inventory/BrewingStandMenu.cpp
index 7d432eb1a..a63b595dd 100644
--- a/targets/minecraft/world/inventory/BrewingStandMenu.cpp
+++ b/targets/minecraft/world/inventory/BrewingStandMenu.cpp
@@ -1,6 +1,7 @@
+#include "BrewingStandMenu.h"
+
 #include <vector>
 
-#include "BrewingStandMenu.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/inventory/ContainerMenu.cpp b/targets/minecraft/world/inventory/ContainerMenu.cpp
index 2497bcee4..a7d8eb854 100644
--- a/targets/minecraft/world/inventory/ContainerMenu.cpp
+++ b/targets/minecraft/world/inventory/ContainerMenu.cpp
@@ -1,11 +1,12 @@
+#include "ContainerMenu.h"
+
 #include <vector>
 
 #include "Slot.h"
-#include "minecraft/stats/GenericStats.h"
-#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/player/LocalPlayer.h"
-#include "ContainerMenu.h"
+#include "minecraft/stats/GenericStats.h"
+#include "minecraft/stats/StatsCounter.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
diff --git a/targets/minecraft/world/inventory/CraftingContainer.cpp b/targets/minecraft/world/inventory/CraftingContainer.cpp
index 782398ed6..3340a2aad 100644
--- a/targets/minecraft/world/inventory/CraftingContainer.cpp
+++ b/targets/minecraft/world/inventory/CraftingContainer.cpp
@@ -1,7 +1,8 @@
+#include "CraftingContainer.h"
+
 #include <vector>
 
 #include "AbstractContainerMenu.h"
-#include "CraftingContainer.h"
 
 CraftingContainer::~CraftingContainer() {}
 
diff --git a/targets/minecraft/world/inventory/CraftingContainer.h b/targets/minecraft/world/inventory/CraftingContainer.h
index 432a7d928..7c9a9b3cf 100644
--- a/targets/minecraft/world/inventory/CraftingContainer.h
+++ b/targets/minecraft/world/inventory/CraftingContainer.h
@@ -4,7 +4,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/Container.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/item/ItemInstance.h"
 
diff --git a/targets/minecraft/world/inventory/CraftingMenu.cpp b/targets/minecraft/world/inventory/CraftingMenu.cpp
index fbfb64fd0..a8a9c4a20 100644
--- a/targets/minecraft/world/inventory/CraftingMenu.cpp
+++ b/targets/minecraft/world/inventory/CraftingMenu.cpp
@@ -1,9 +1,10 @@
+#include "CraftingMenu.h"
+
 #include <vector>
 
 #include "CraftingContainer.h"
 #include "ResultContainer.h"
 #include "ResultSlot.h"
-#include "CraftingMenu.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/inventory/EnchantmentContainer.cpp b/targets/minecraft/world/inventory/EnchantmentContainer.cpp
index 6eb261bd2..f4e773d1c 100644
--- a/targets/minecraft/world/inventory/EnchantmentContainer.cpp
+++ b/targets/minecraft/world/inventory/EnchantmentContainer.cpp
@@ -1,6 +1,7 @@
-#include "net.minecraft.world.inventory.h"
 #include "EnchantmentContainer.h"
 
+#include "net.minecraft.world.inventory.h"
+
 EnchantmentContainer::EnchantmentContainer(EnchantmentMenu* menu)
     : SimpleContainer(IDS_ENCHANT, L"", false, 1), m_menu(menu) {}
 
diff --git a/targets/minecraft/world/inventory/EnchantmentMenu.cpp b/targets/minecraft/world/inventory/EnchantmentMenu.cpp
index 6beb09a74..15e29f6de 100644
--- a/targets/minecraft/world/inventory/EnchantmentMenu.cpp
+++ b/targets/minecraft/world/inventory/EnchantmentMenu.cpp
@@ -1,7 +1,8 @@
+#include "EnchantmentMenu.h"
+
 #include <format>
 #include <vector>
 
-#include "EnchantmentMenu.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
diff --git a/targets/minecraft/world/inventory/EnchantmentMenu.h b/targets/minecraft/world/inventory/EnchantmentMenu.h
index 25f400e49..cf44b6dc0 100644
--- a/targets/minecraft/world/inventory/EnchantmentMenu.h
+++ b/targets/minecraft/world/inventory/EnchantmentMenu.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "AbstractContainerMenu.h"
diff --git a/targets/minecraft/world/inventory/FireworksMenu.cpp b/targets/minecraft/world/inventory/FireworksMenu.cpp
index 2c72ad24d..a20a436e0 100644
--- a/targets/minecraft/world/inventory/FireworksMenu.cpp
+++ b/targets/minecraft/world/inventory/FireworksMenu.cpp
@@ -1,9 +1,10 @@
+#include "FireworksMenu.h"
+
 #include <vector>
 
 #include "CraftingContainer.h"
 #include "ResultContainer.h"
 #include "ResultSlot.h"
-#include "FireworksMenu.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/inventory/FurnaceMenu.cpp b/targets/minecraft/world/inventory/FurnaceMenu.cpp
index 5b0f22e55..6ecbd2078 100644
--- a/targets/minecraft/world/inventory/FurnaceMenu.cpp
+++ b/targets/minecraft/world/inventory/FurnaceMenu.cpp
@@ -1,10 +1,10 @@
+#include "FurnaceMenu.h"
+
 #include <vector>
 
 #include "FurnaceResultSlot.h"
 #include "Slot.h"
 #include "minecraft/stats/GenericStats.h"
-#include "FurnaceMenu.h"
-#include "minecraft/world/item/crafting/FurnaceRecipes.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
@@ -12,6 +12,7 @@
 #include "minecraft/world/item/CoalItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/item/crafting/FurnaceRecipes.h"
 #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
 
 FurnaceMenu::FurnaceMenu(std::shared_ptr<Inventory> inventory,
diff --git a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp
index ef82f4925..0639ab242 100644
--- a/targets/minecraft/world/inventory/FurnaceResultSlot.cpp
+++ b/targets/minecraft/world/inventory/FurnaceResultSlot.cpp
@@ -1,8 +1,9 @@
+#include "FurnaceResultSlot.h"
+
 #include <algorithm>
 #include <cmath>
 
 #include "java/JavaMath.h"
-#include "FurnaceResultSlot.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/ExperienceOrb.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/inventory/HopperMenu.cpp b/targets/minecraft/world/inventory/HopperMenu.cpp
index 4b61018f5..365aba045 100644
--- a/targets/minecraft/world/inventory/HopperMenu.cpp
+++ b/targets/minecraft/world/inventory/HopperMenu.cpp
@@ -1,6 +1,7 @@
+#include "HopperMenu.h"
+
 #include <vector>
 
-#include "HopperMenu.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
 #include "minecraft/world/inventory/Slot.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp
index b700404a6..9e696fb45 100644
--- a/targets/minecraft/world/inventory/HorseInventoryMenu.cpp
+++ b/targets/minecraft/world/inventory/HorseInventoryMenu.cpp
@@ -1,6 +1,7 @@
+#include "HorseInventoryMenu.h"
+
 #include <vector>
 
-#include "HorseInventoryMenu.h"
 #include "minecraft/world/entity/animal/EntityHorse.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
diff --git a/targets/minecraft/world/inventory/InventoryMenu.cpp b/targets/minecraft/world/inventory/InventoryMenu.cpp
index a069a225a..d65f36a7b 100644
--- a/targets/minecraft/world/inventory/InventoryMenu.cpp
+++ b/targets/minecraft/world/inventory/InventoryMenu.cpp
@@ -1,10 +1,11 @@
+#include "InventoryMenu.h"
+
 #include <vector>
 
-#include "ResultSlot.h"
 #include "ArmorSlot.h"
 #include "CraftingContainer.h"
 #include "ResultContainer.h"
-#include "InventoryMenu.h"
+#include "ResultSlot.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
diff --git a/targets/minecraft/world/inventory/MenuBackup.cpp b/targets/minecraft/world/inventory/MenuBackup.cpp
index 2bfe2600d..807625a9b 100644
--- a/targets/minecraft/world/inventory/MenuBackup.cpp
+++ b/targets/minecraft/world/inventory/MenuBackup.cpp
@@ -1,8 +1,9 @@
+#include "MenuBackup.h"
+
 #include <vector>
 
 #include "AbstractContainerMenu.h"
 #include "Slot.h"
-#include "MenuBackup.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/item/ItemInstance.h"
 
diff --git a/targets/minecraft/world/inventory/MenuBackup.h b/targets/minecraft/world/inventory/MenuBackup.h
index 5f64ee1fe..6c299cf4f 100644
--- a/targets/minecraft/world/inventory/MenuBackup.h
+++ b/targets/minecraft/world/inventory/MenuBackup.h
@@ -3,6 +3,7 @@
 #include <format>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 class AbstractContainerMenu;
 class Inventory;
diff --git a/targets/minecraft/world/inventory/MerchantContainer.cpp b/targets/minecraft/world/inventory/MerchantContainer.cpp
index 846e6df8e..e70e19742 100644
--- a/targets/minecraft/world/inventory/MerchantContainer.cpp
+++ b/targets/minecraft/world/inventory/MerchantContainer.cpp
@@ -1,5 +1,6 @@
-#include "MerchantMenu.h"
 #include "MerchantContainer.h"
+
+#include "MerchantMenu.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/trading/Merchant.h"
 #include "minecraft/world/item/trading/MerchantRecipe.h"
diff --git a/targets/minecraft/world/inventory/MerchantContainer.h b/targets/minecraft/world/inventory/MerchantContainer.h
index a9e9f03d9..fbc682d62 100644
--- a/targets/minecraft/world/inventory/MerchantContainer.h
+++ b/targets/minecraft/world/inventory/MerchantContainer.h
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/world/Container.h"
 #include "minecraft/world/Container.h"
 
 class Merchant;
diff --git a/targets/minecraft/world/inventory/MerchantMenu.cpp b/targets/minecraft/world/inventory/MerchantMenu.cpp
index a1f7654f5..246f802e4 100644
--- a/targets/minecraft/world/inventory/MerchantMenu.cpp
+++ b/targets/minecraft/world/inventory/MerchantMenu.cpp
@@ -1,6 +1,7 @@
+#include "MerchantMenu.h"
+
 #include <vector>
 
-#include "MerchantMenu.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/AbstractContainerMenu.h"
diff --git a/targets/minecraft/world/inventory/MerchantResultSlot.cpp b/targets/minecraft/world/inventory/MerchantResultSlot.cpp
index 1042a3444..86c930cbc 100644
--- a/targets/minecraft/world/inventory/MerchantResultSlot.cpp
+++ b/targets/minecraft/world/inventory/MerchantResultSlot.cpp
@@ -1,6 +1,7 @@
+#include "MerchantResultSlot.h"
+
 #include <algorithm>
 
-#include "MerchantResultSlot.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/inventory/MerchantContainer.h"
 #include "minecraft/world/inventory/MerchantMenu.h"
diff --git a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp
index 01176c36f..fbc5d86bd 100644
--- a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp
+++ b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp
@@ -1,7 +1,8 @@
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/network/packet/ContainerOpenPacket.h"
 #include "PlayerEnderChestContainer.h"
 
+#include "minecraft/network/packet/ContainerOpenPacket.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+
 PlayerEnderChestContainer::PlayerEnderChestContainer()
     : SimpleContainer(IDS_TILE_ENDERCHEST, L"", false, 9 * 3) {
     activeChest = nullptr;
diff --git a/targets/minecraft/world/inventory/PlayerEnderChestContainer.h b/targets/minecraft/world/inventory/PlayerEnderChestContainer.h
index 630e375a2..1e2586da7 100644
--- a/targets/minecraft/world/inventory/PlayerEnderChestContainer.h
+++ b/targets/minecraft/world/inventory/PlayerEnderChestContainer.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "minecraft/world/SimpleContainer.h"
+#include <memory>
 
+#include "minecraft/world/SimpleContainer.h"
+#include "nbt/CompoundTag.h"
+
+class ItemInstance;
 class EnderChestTileEntity;
 
 class PlayerEnderChestContainer : public SimpleContainer {
diff --git a/targets/minecraft/world/inventory/RepairContainer.cpp b/targets/minecraft/world/inventory/RepairContainer.cpp
index a0a722280..00b0cda98 100644
--- a/targets/minecraft/world/inventory/RepairContainer.cpp
+++ b/targets/minecraft/world/inventory/RepairContainer.cpp
@@ -1,7 +1,8 @@
+#include "RepairContainer.h"
+
 #include <string>
 
 #include "AnvilMenu.h"
-#include "RepairContainer.h"
 #include "minecraft/world/SimpleContainer.h"
 
 RepairContainer::RepairContainer(AnvilMenu* menu, int name, bool customName,
diff --git a/targets/minecraft/world/inventory/RepairResultSlot.cpp b/targets/minecraft/world/inventory/RepairResultSlot.cpp
index 926752cc5..2c4942202 100644
--- a/targets/minecraft/world/inventory/RepairResultSlot.cpp
+++ b/targets/minecraft/world/inventory/RepairResultSlot.cpp
@@ -1,4 +1,5 @@
 #include "RepairResultSlot.h"
+
 #include "java/Random.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Abilities.h"
diff --git a/targets/minecraft/world/inventory/ResultContainer.h b/targets/minecraft/world/inventory/ResultContainer.h
index 7ddfd941a..a10469e6c 100644
--- a/targets/minecraft/world/inventory/ResultContainer.h
+++ b/targets/minecraft/world/inventory/ResultContainer.h
@@ -3,7 +3,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/world/Container.h"
 #include "minecraft/world/Container.h"
 
 class ItemInstance;
diff --git a/targets/minecraft/world/inventory/ResultSlot.cpp b/targets/minecraft/world/inventory/ResultSlot.cpp
index ee7a5addb..1169e564d 100644
--- a/targets/minecraft/world/inventory/ResultSlot.cpp
+++ b/targets/minecraft/world/inventory/ResultSlot.cpp
@@ -1,6 +1,7 @@
+#include "ResultSlot.h"
+
 #include <algorithm>
 
-#include "ResultSlot.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/player/Inventory.h"
diff --git a/targets/minecraft/world/inventory/Slot.cpp b/targets/minecraft/world/inventory/Slot.cpp
index 4ffb5e4fe..264703bd6 100644
--- a/targets/minecraft/world/inventory/Slot.cpp
+++ b/targets/minecraft/world/inventory/Slot.cpp
@@ -1,6 +1,7 @@
+#include "Slot.h"
+
 #include <vector>
 
-#include "Slot.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/inventory/CraftingContainer.h"
 #include "minecraft/world/item/ArmorItem.h"
diff --git a/targets/minecraft/world/inventory/TrapMenu.cpp b/targets/minecraft/world/inventory/TrapMenu.cpp
index 53c50ea97..3a2573d7d 100644
--- a/targets/minecraft/world/inventory/TrapMenu.cpp
+++ b/targets/minecraft/world/inventory/TrapMenu.cpp
@@ -1,7 +1,8 @@
+#include "TrapMenu.h"
+
 #include <vector>
 
 #include "Slot.h"
-#include "TrapMenu.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
 
diff --git a/targets/minecraft/world/inventory/net.minecraft.world.inventory.h b/targets/minecraft/world/inventory/net.minecraft.world.inventory.h
index 82a8a52d0..3d6d38f04 100644
--- a/targets/minecraft/world/inventory/net.minecraft.world.inventory.h
+++ b/targets/minecraft/world/inventory/net.minecraft.world.inventory.h
@@ -2,12 +2,16 @@
 
 #include "AbstractContainerMenu.h"
 #include "AnimalChest.h"
+#include "AnvilMenu.h"
 #include "ArmorSlot.h"
 #include "BeaconMenu.h"
-#include "net.minecraft.world.inventory.ContainerListener.h"
+#include "BrewingStandMenu.h"
 #include "ContainerMenu.h"
 #include "CraftingContainer.h"
 #include "CraftingMenu.h"
+#include "EnchantmentContainer.h"
+#include "EnchantmentMenu.h"
+#include "EnchantmentSlot.h"
 #include "FireworksMenu.h"
 #include "FurnaceMenu.h"
 #include "FurnaceResultSlot.h"
@@ -15,18 +19,14 @@
 #include "HorseInventoryMenu.h"
 #include "InventoryMenu.h"
 #include "MenuBackup.h"
-#include "ResultContainer.h"
-#include "ResultSlot.h"
-#include "Slot.h"
-#include "TrapMenu.h"
-#include "EnchantmentMenu.h"
-#include "EnchantmentSlot.h"
-#include "EnchantmentContainer.h"
-#include "BrewingStandMenu.h"
 #include "MerchantContainer.h"
 #include "MerchantMenu.h"
 #include "MerchantResultSlot.h"
 #include "PlayerEnderChestContainer.h"
-#include "AnvilMenu.h"
 #include "RepairContainer.h"
-#include "RepairResultSlot.h"
\ No newline at end of file
+#include "RepairResultSlot.h"
+#include "ResultContainer.h"
+#include "ResultSlot.h"
+#include "Slot.h"
+#include "TrapMenu.h"
+#include "net.minecraft.world.inventory.ContainerListener.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/AnvilTileItem.cpp b/targets/minecraft/world/item/AnvilTileItem.cpp
index 9c4feadf2..cbd09cc10 100644
--- a/targets/minecraft/world/item/AnvilTileItem.cpp
+++ b/targets/minecraft/world/item/AnvilTileItem.cpp
@@ -1,4 +1,5 @@
 #include "AnvilTileItem.h"
+
 #include "minecraft/world/item/MultiTextureTileItem.h"
 #include "minecraft/world/level/tile/AnvilTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp
index 37aeb1ac8..2c834369a 100644
--- a/targets/minecraft/world/item/ArmorItem.cpp
+++ b/targets/minecraft/world/item/ArmorItem.cpp
@@ -1,13 +1,14 @@
+#include "ArmorItem.h"
+
 #include <stdio.h>
+
 #include <format>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "ArmorItem.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/Class.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/core/BehaviorRegistry.h"
 #include "minecraft/core/BlockSource.h"
 #include "minecraft/core/DefaultDispenseItemBehavior.h"
@@ -21,6 +22,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/DispenserTile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
 
 class Entity;
 class Icon;
diff --git a/targets/minecraft/world/item/ArmorItem.h b/targets/minecraft/world/item/ArmorItem.h
index 89653be17..e97bce353 100644
--- a/targets/minecraft/world/item/ArmorItem.h
+++ b/targets/minecraft/world/item/ArmorItem.h
@@ -4,8 +4,8 @@
 #include <string>
 
 #include "Item.h"
-#include "minecraft/core/DefaultDispenseItemBehavior.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "minecraft/core/DefaultDispenseItemBehavior.h"
 
 class Icon;
 class ItemInstance;
diff --git a/targets/minecraft/world/item/AuxDataTileItem.cpp b/targets/minecraft/world/item/AuxDataTileItem.cpp
index b2ee0c82a..210bfb83d 100644
--- a/targets/minecraft/world/item/AuxDataTileItem.cpp
+++ b/targets/minecraft/world/item/AuxDataTileItem.cpp
@@ -1,4 +1,5 @@
 #include "AuxDataTileItem.h"
+
 #include "minecraft/world/item/TileItem.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/item/BedItem.cpp b/targets/minecraft/world/item/BedItem.cpp
index 1d7f6d84a..e1701cff5 100644
--- a/targets/minecraft/world/item/BedItem.cpp
+++ b/targets/minecraft/world/item/BedItem.cpp
@@ -1,9 +1,10 @@
+#include "BedItem.h"
+
 #include <memory>
 
+#include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
 #include "minecraft/stats/GenericStats.h"
-#include "BedItem.h"
-#include "minecraft/Direction.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/BoatItem.cpp b/targets/minecraft/world/item/BoatItem.cpp
index 0dfcfa02d..5d2fa7d9b 100644
--- a/targets/minecraft/world/item/BoatItem.cpp
+++ b/targets/minecraft/world/item/BoatItem.cpp
@@ -1,12 +1,13 @@
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "BoatItem.h"
+
+#include "ItemInstance.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/util/Mth.h"
-#include "ItemInstance.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "BoatItem.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
 
 BoatItem::BoatItem(int id) : Item(id) { maxStackSize = 1; }
 
diff --git a/targets/minecraft/world/item/BookItem.cpp b/targets/minecraft/world/item/BookItem.cpp
index 7c93eb50d..ad760aa64 100644
--- a/targets/minecraft/world/item/BookItem.cpp
+++ b/targets/minecraft/world/item/BookItem.cpp
@@ -1,6 +1,7 @@
+#include "BookItem.h"
+
 #include <memory>
 
-#include "BookItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 
diff --git a/targets/minecraft/world/item/BottleItem.cpp b/targets/minecraft/world/item/BottleItem.cpp
index d03289ec9..8ab3efa1b 100644
--- a/targets/minecraft/world/item/BottleItem.cpp
+++ b/targets/minecraft/world/item/BottleItem.cpp
@@ -1,6 +1,7 @@
+#include "BottleItem.h"
+
 #include <memory>
 
-#include "BottleItem.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/BowItem.cpp b/targets/minecraft/world/item/BowItem.cpp
index 081d53cb0..4cee3a56a 100644
--- a/targets/minecraft/world/item/BowItem.cpp
+++ b/targets/minecraft/world/item/BowItem.cpp
@@ -1,8 +1,9 @@
+#include "BowItem.h"
+
 #include <memory>
 
-#include "BowItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
diff --git a/targets/minecraft/world/item/BowlFoodItem.cpp b/targets/minecraft/world/item/BowlFoodItem.cpp
index 8184153ff..5489c65c6 100644
--- a/targets/minecraft/world/item/BowlFoodItem.cpp
+++ b/targets/minecraft/world/item/BowlFoodItem.cpp
@@ -1,6 +1,7 @@
+#include "BowlFoodItem.h"
+
 #include <memory>
 
-#include "BowlFoodItem.h"
 #include "minecraft/world/item/FoodItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp
index d7eb7e261..9bee7d363 100644
--- a/targets/minecraft/world/item/BucketItem.cpp
+++ b/targets/minecraft/world/item/BucketItem.cpp
@@ -1,17 +1,17 @@
+#include "BucketItem.h"
+
 #include <memory>
 #include <string>
 
+#include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/Class.h"
 #include "java/JavaMath.h"
-#include "minecraft/world/level/material/Material.h"
-#include "BucketItem.h"
+#include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/network/packet/ChatPacket.h"
 #include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/server/network/PlayerConnection.h"
-#include "minecraft/network/packet/ChatPacket.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Class.h"
-#include "java/Random.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/player/Abilities.h"
@@ -21,6 +21,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/HitResult.h"
 
diff --git a/targets/minecraft/world/item/CarrotOnAStickItem.cpp b/targets/minecraft/world/item/CarrotOnAStickItem.cpp
index ad5f3a0a0..5de3564e4 100644
--- a/targets/minecraft/world/item/CarrotOnAStickItem.cpp
+++ b/targets/minecraft/world/item/CarrotOnAStickItem.cpp
@@ -1,6 +1,7 @@
+#include "CarrotOnAStickItem.h"
+
 #include <memory>
 
-#include "CarrotOnAStickItem.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/ai/goal/ControlledByPlayerGoal.h"
 #include "minecraft/world/entity/animal/Pig.h"
diff --git a/targets/minecraft/world/item/ClockItem.cpp b/targets/minecraft/world/item/ClockItem.cpp
index 5bb003651..7650678e5 100644
--- a/targets/minecraft/world/item/ClockItem.cpp
+++ b/targets/minecraft/world/item/ClockItem.cpp
@@ -1,6 +1,7 @@
+#include "ClockItem.h"
+
 #include <memory>
 
-#include "ClockItem.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/item/ClockItem.h b/targets/minecraft/world/item/ClockItem.h
index 82a4009d2..a0e035a3d 100644
--- a/targets/minecraft/world/item/ClockItem.h
+++ b/targets/minecraft/world/item/ClockItem.h
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "Item.h"
 #include "4J.Common/4J_Compat.h"
+#include "Item.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/item/CoalItem.cpp b/targets/minecraft/world/item/CoalItem.cpp
index ab89f189c..6b28395d5 100644
--- a/targets/minecraft/world/item/CoalItem.cpp
+++ b/targets/minecraft/world/item/CoalItem.cpp
@@ -1,8 +1,9 @@
-#include "net.minecraft.world.item.h"
+#include "CoalItem.h"
+
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "CoalItem.h"
+#include "net.minecraft.world.item.h"
 
 CoalItem::CoalItem(int id) : Item(id) {
     setStackedByData(true);
diff --git a/targets/minecraft/world/item/ColoredTileItem.cpp b/targets/minecraft/world/item/ColoredTileItem.cpp
index aeaef18ea..d28fa974d 100644
--- a/targets/minecraft/world/item/ColoredTileItem.cpp
+++ b/targets/minecraft/world/item/ColoredTileItem.cpp
@@ -1,6 +1,7 @@
+#include "ColoredTileItem.h"
+
 #include <memory>
 
-#include "ColoredTileItem.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/TileItem.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/item/CompassItem.cpp b/targets/minecraft/world/item/CompassItem.cpp
index e9b0be5e4..3b1fe2db6 100644
--- a/targets/minecraft/world/item/CompassItem.cpp
+++ b/targets/minecraft/world/item/CompassItem.cpp
@@ -1,6 +1,7 @@
+#include "CompassItem.h"
+
 #include <memory>
 
-#include "CompassItem.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/item/CompassItem.h b/targets/minecraft/world/item/CompassItem.h
index e3ff5326f..9df65ec01 100644
--- a/targets/minecraft/world/item/CompassItem.h
+++ b/targets/minecraft/world/item/CompassItem.h
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "Item.h"
 #include "4J.Common/4J_Compat.h"
+#include "Item.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/item/ComplexItem.cpp b/targets/minecraft/world/item/ComplexItem.cpp
index e683a2958..2ccdb062f 100644
--- a/targets/minecraft/world/item/ComplexItem.cpp
+++ b/targets/minecraft/world/item/ComplexItem.cpp
@@ -1,4 +1,5 @@
 #include "ComplexItem.h"
+
 #include "minecraft/world/item/Item.h"
 
 class ItemInstance;
diff --git a/targets/minecraft/world/item/DiggerItem.cpp b/targets/minecraft/world/item/DiggerItem.cpp
index 689897b8e..92f213f7d 100644
--- a/targets/minecraft/world/item/DiggerItem.cpp
+++ b/targets/minecraft/world/item/DiggerItem.cpp
@@ -1,7 +1,8 @@
+#include "DiggerItem.h"
+
 #include <memory>
 #include <vector>
 
-#include "DiggerItem.h"
 #include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/DoorItem.cpp b/targets/minecraft/world/item/DoorItem.cpp
index b666857df..e461ae5f2 100644
--- a/targets/minecraft/world/item/DoorItem.cpp
+++ b/targets/minecraft/world/item/DoorItem.cpp
@@ -1,15 +1,16 @@
 
+#include "DoorItem.h"
+
 #include <memory>
 
 #include "minecraft/Facing.h"
-#include "minecraft/world/level/material/Material.h"
 #include "minecraft/stats/GenericStats.h"
-#include "DoorItem.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
 DoorItem::DoorItem(int id, Material* material) : Item(id) {
diff --git a/targets/minecraft/world/item/DyePowderItem.cpp b/targets/minecraft/world/item/DyePowderItem.cpp
index 3cabffa08..452632dfc 100644
--- a/targets/minecraft/world/item/DyePowderItem.cpp
+++ b/targets/minecraft/world/item/DyePowderItem.cpp
@@ -1,17 +1,18 @@
 
-#include "nbt/com.mojang.nbt.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "net.minecraft.world.item.h"
+#include "DyePowderItem.h"
+
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/global/net.minecraft.world.entity.global.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/level/material/Material.h"
-#include "DyePowderItem.h"
-#include "minecraft/util/Mth.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "nbt/com.mojang.nbt.h"
+#include "net.minecraft.world.item.h"
 
 DyePowderItem::DyePowderItem(int id) : Item(id) {
     setStackedByData(true);
diff --git a/targets/minecraft/world/item/EggItem.cpp b/targets/minecraft/world/item/EggItem.cpp
index 1c7f3ed79..01e664d77 100644
--- a/targets/minecraft/world/item/EggItem.cpp
+++ b/targets/minecraft/world/item/EggItem.cpp
@@ -1,9 +1,10 @@
 
+#include "EggItem.h"
+
 #include <memory>
 
-#include "EggItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/ThrownEgg.h"
diff --git a/targets/minecraft/world/item/EmptyMapItem.cpp b/targets/minecraft/world/item/EmptyMapItem.cpp
index aeed6d572..73e6ceae5 100644
--- a/targets/minecraft/world/item/EmptyMapItem.cpp
+++ b/targets/minecraft/world/item/EmptyMapItem.cpp
@@ -1,6 +1,7 @@
+#include "EmptyMapItem.h"
+
 #include <memory>
 
-#include "EmptyMapItem.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ComplexItem.h"
diff --git a/targets/minecraft/world/item/EnchantedBookItem.cpp b/targets/minecraft/world/item/EnchantedBookItem.cpp
index 7b4504ef1..136715927 100644
--- a/targets/minecraft/world/item/EnchantedBookItem.cpp
+++ b/targets/minecraft/world/item/EnchantedBookItem.cpp
@@ -1,15 +1,16 @@
+#include "EnchantedBookItem.h"
+
 #include <vector>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "EnchantedBookItem.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/util/HtmlString.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/Rarity.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 const std::wstring EnchantedBookItem::TAG_STORED_ENCHANTMENTS =
     L"StoredEnchantments";
diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp
index 2b34ef17c..ab8f37204 100644
--- a/targets/minecraft/world/item/EnderEyeItem.cpp
+++ b/targets/minecraft/world/item/EnderEyeItem.cpp
@@ -1,12 +1,12 @@
+#include "EnderEyeItem.h"
+
 #include <memory>
 
-#include "EnderEyeItem.h"
-#include "minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/EyeOfEnderSignal.h"
@@ -14,6 +14,7 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/level/tile/TheEndPortalFrameTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/item/EnderpearlItem.cpp b/targets/minecraft/world/item/EnderpearlItem.cpp
index 76b4ef682..851b958c7 100644
--- a/targets/minecraft/world/item/EnderpearlItem.cpp
+++ b/targets/minecraft/world/item/EnderpearlItem.cpp
@@ -1,8 +1,9 @@
+#include "EnderpearlItem.h"
+
 #include <memory>
 
-#include "EnderpearlItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/ThrownEnderpearl.h"
diff --git a/targets/minecraft/world/item/ExperienceItem.cpp b/targets/minecraft/world/item/ExperienceItem.cpp
index 98cf9a550..207faa5fb 100644
--- a/targets/minecraft/world/item/ExperienceItem.cpp
+++ b/targets/minecraft/world/item/ExperienceItem.cpp
@@ -1,8 +1,9 @@
+#include "ExperienceItem.h"
+
 #include <memory>
 
-#include "ExperienceItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/ThrownExpBottle.h"
diff --git a/targets/minecraft/world/item/FireChargeItem.cpp b/targets/minecraft/world/item/FireChargeItem.cpp
index ba8847b79..a0721cb40 100644
--- a/targets/minecraft/world/item/FireChargeItem.cpp
+++ b/targets/minecraft/world/item/FireChargeItem.cpp
@@ -1,16 +1,17 @@
+#include "FireChargeItem.h"
+
 #include <memory>
 #include <string>
 
-#include "FireChargeItem.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 FireChargeItem::FireChargeItem(int id) : Item(id) {
     m_dragonFireballIcon = nullptr;
diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp
index 8b6662599..1451d3988 100644
--- a/targets/minecraft/world/item/FireworksChargeItem.cpp
+++ b/targets/minecraft/world/item/FireworksChargeItem.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/stdafx.h"
-
-#include "net.minecraft.world.item.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "FireworksChargeItem.h"
 
+#include "minecraft/stdafx.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "net.minecraft.world.item.h"
+
 FireworksChargeItem::FireworksChargeItem(int id) : Item(id) {}
 
 Icon* FireworksChargeItem::getLayerIcon(int auxValue, int spriteLayer) {
diff --git a/targets/minecraft/world/item/FireworksChargeItem.h b/targets/minecraft/world/item/FireworksChargeItem.h
index 9b3a77f74..565807036 100644
--- a/targets/minecraft/world/item/FireworksChargeItem.h
+++ b/targets/minecraft/world/item/FireworksChargeItem.h
@@ -1,6 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "Item.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/Tag.h"
 
 class FireworksChargeItem : public Item {
 private:
diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp
index 49c97bd42..9641e3605 100644
--- a/targets/minecraft/world/item/FireworksItem.cpp
+++ b/targets/minecraft/world/item/FireworksItem.cpp
@@ -1,11 +1,11 @@
-#include "minecraft/stdafx.h"
+#include "FireworksItem.h"
 
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/stdafx.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
-#include "FireworksItem.h"
-#include "console_helpers/StringHelpers.h"
+#include "net.minecraft.world.item.h"
 
 const std::wstring FireworksItem::TAG_FIREWORKS = L"Fireworks";
 const std::wstring FireworksItem::TAG_EXPLOSION = L"Explosion";
diff --git a/targets/minecraft/world/item/FishingRodItem.cpp b/targets/minecraft/world/item/FishingRodItem.cpp
index f3c58c64b..fc1a1af73 100644
--- a/targets/minecraft/world/item/FishingRodItem.cpp
+++ b/targets/minecraft/world/item/FishingRodItem.cpp
@@ -1,9 +1,10 @@
+#include "FishingRodItem.h"
+
 #include <memory>
 #include <string>
 
-#include "FishingRodItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/FishingHook.h"
diff --git a/targets/minecraft/world/item/FlintAndSteelItem.cpp b/targets/minecraft/world/item/FlintAndSteelItem.cpp
index fdcf993e2..16d49a8ec 100644
--- a/targets/minecraft/world/item/FlintAndSteelItem.cpp
+++ b/targets/minecraft/world/item/FlintAndSteelItem.cpp
@@ -1,8 +1,9 @@
+#include "FlintAndSteelItem.h"
+
 #include <memory>
 
-#include "FlintAndSteelItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/FoodItem.cpp b/targets/minecraft/world/item/FoodItem.cpp
index c8b5fbcee..b1a0f0e77 100644
--- a/targets/minecraft/world/item/FoodItem.cpp
+++ b/targets/minecraft/world/item/FoodItem.cpp
@@ -1,7 +1,8 @@
 #include "FoodItem.h"
-#include "minecraft/sounds/SoundTypes.h"
+
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodConstants.h"
diff --git a/targets/minecraft/world/item/GoldenAppleItem.cpp b/targets/minecraft/world/item/GoldenAppleItem.cpp
index 8fdc63aaf..7da37f5a0 100644
--- a/targets/minecraft/world/item/GoldenAppleItem.cpp
+++ b/targets/minecraft/world/item/GoldenAppleItem.cpp
@@ -1,8 +1,9 @@
+#include "GoldenAppleItem.h"
+
+#include "minecraft/SharedConstants.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/SharedConstants.h"
-#include "GoldenAppleItem.h"
 
 GoldenAppleItem::GoldenAppleItem(int id, int nutrition, float saturationMod,
                                  bool isMeat)
diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp
index 74878d284..2ecdb53dd 100644
--- a/targets/minecraft/world/item/HangingEntityItem.cpp
+++ b/targets/minecraft/world/item/HangingEntityItem.cpp
@@ -1,14 +1,15 @@
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "HangingEntityItem.h"
-#include "minecraft/world/entity/HangingEntity.h"
-#include "minecraft/world/entity/Painting.h"
+
+#include "minecraft/net.minecraft.h"
 #include "minecraft/stats/GenericStats.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/entity/HangingEntity.h"
 #include "minecraft/world/entity/ItemFrame.h"
+#include "minecraft/world/entity/Painting.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "net.minecraft.world.item.h"
 
 HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType)
     : Item(id) {
diff --git a/targets/minecraft/world/item/HangingEntityItem.h b/targets/minecraft/world/item/HangingEntityItem.h
index 7be0517b7..b2e4eee9b 100644
--- a/targets/minecraft/world/item/HangingEntityItem.h
+++ b/targets/minecraft/world/item/HangingEntityItem.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "Item.h"
+#include "java/Class.h"
 
 class HangingEntity;
 
diff --git a/targets/minecraft/world/item/HatchetItem.cpp b/targets/minecraft/world/item/HatchetItem.cpp
index eb613bb6e..0208e4b4c 100644
--- a/targets/minecraft/world/item/HatchetItem.cpp
+++ b/targets/minecraft/world/item/HatchetItem.cpp
@@ -1,7 +1,8 @@
+#include "HatchetItem.h"
+
 #include <memory>
 #include <vector>
 
-#include "HatchetItem.h"
 #include "minecraft/world/item/DiggerItem.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/ChestTile.h"
diff --git a/targets/minecraft/world/item/HoeItem.cpp b/targets/minecraft/world/item/HoeItem.cpp
index 84e1fec47..e44f59927 100644
--- a/targets/minecraft/world/item/HoeItem.cpp
+++ b/targets/minecraft/world/item/HoeItem.cpp
@@ -1,6 +1,7 @@
+#include "HoeItem.h"
+
 #include <memory>
 
-#include "HoeItem.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp
index 06a29a5dd..8c9c37fda 100644
--- a/targets/minecraft/world/item/Item.cpp
+++ b/targets/minecraft/world/item/Item.cpp
@@ -1,21 +1,22 @@
 
+#include "Item.h"
+
+#include "HangingEntityItem.h"
+#include "MapItem.h"
 #include "minecraft/locale/net.minecraft.locale.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/util/HtmlString.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/food/net.minecraft.world.food.h"
+#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "net.minecraft.world.item.h"
-#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
-#include "minecraft/world/food/net.minecraft.world.food.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "MapItem.h"
-#include "Item.h"
-#include "HangingEntityItem.h"
-#include "minecraft/util/HtmlString.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "minecraft/util/Mth.h"
+#include "net.minecraft.world.item.h"
 
 typedef Item::Tier _Tier;
 
diff --git a/targets/minecraft/world/item/Item.h b/targets/minecraft/world/item/Item.h
index b27f15430..12377619a 100644
--- a/targets/minecraft/world/item/Item.h
+++ b/targets/minecraft/world/item/Item.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "Rarity.h"
+#include "UseAnim.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
-#include "UseAnim.h"
-#include "Rarity.h"
 
 class MapItem;
 class Mob;
diff --git a/targets/minecraft/world/item/ItemInstance.cpp b/targets/minecraft/world/item/ItemInstance.cpp
index a36b2ad42..24b6763ec 100644
--- a/targets/minecraft/world/item/ItemInstance.cpp
+++ b/targets/minecraft/world/item/ItemInstance.cpp
@@ -1,5 +1,8 @@
+#include "minecraft/world/item/ItemInstance.h"
+
 #include <assert.h>
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <sstream>
@@ -9,14 +12,9 @@
 #include <vector>
 
 #include "Item.h"
-#include "minecraft/util/HtmlString.h"
-#include "minecraft/world/item/ItemInstance.h"
 #include "console_helpers/StringHelpers.h"
-#include "minecraft/world/item/alchemy/PotionMacros.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/IntTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/stats/GenericStats.h"
+#include "minecraft/util/HtmlString.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
 #include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
@@ -27,10 +25,14 @@
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/item/UseAnim.h"
+#include "minecraft/world/item/alchemy/PotionMacros.h"
 #include "minecraft/world/item/enchantment/DigDurabilityEnchantment.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentHelper.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/IntTag.h"
+#include "nbt/ListTag.h"
 
 class Tag;
 
diff --git a/targets/minecraft/world/item/ItemInstance.h b/targets/minecraft/world/item/ItemInstance.h
index 604ff8a35..62c739177 100644
--- a/targets/minecraft/world/item/ItemInstance.h
+++ b/targets/minecraft/world/item/ItemInstance.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "UseAnim.h"
-#include "nbt/com.mojang.nbt.h"
 #include "minecraft/world/entity/ai/attributes/Attribute.h"
+#include "nbt/com.mojang.nbt.h"
 
 class Entity;
 class Level;
diff --git a/targets/minecraft/world/item/LeafTileItem.cpp b/targets/minecraft/world/item/LeafTileItem.cpp
index 6fc53c28c..82fcf446e 100644
--- a/targets/minecraft/world/item/LeafTileItem.cpp
+++ b/targets/minecraft/world/item/LeafTileItem.cpp
@@ -1,9 +1,10 @@
+#include "LeafTileItem.h"
+
 #include <memory>
 
-#include "LeafTileItem.h"
-#include "minecraft/world/level/FoliageColor.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/TileItem.h"
+#include "minecraft/world/level/FoliageColor.h"
 #include "minecraft/world/level/tile/LeafTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/item/LeashItem.cpp b/targets/minecraft/world/item/LeashItem.cpp
index 389008b9b..ea4fe330b 100644
--- a/targets/minecraft/world/item/LeashItem.cpp
+++ b/targets/minecraft/world/item/LeashItem.cpp
@@ -1,7 +1,8 @@
+#include "LeashItem.h"
+
 #include <format>
 #include <vector>
 
-#include "LeashItem.h"
 #include "minecraft/world/entity/LeashFenceKnotEntity.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/item/MapItem.cpp b/targets/minecraft/world/item/MapItem.cpp
index b8c26b118..9e2f66d3c 100644
--- a/targets/minecraft/world/item/MapItem.cpp
+++ b/targets/minecraft/world/item/MapItem.cpp
@@ -1,13 +1,15 @@
+#include "MapItem.h"
+
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+
 #include <string>
 #include <vector>
 
-#include "MapItem.h"
-#include "java/JavaMath.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
+#include "java/JavaMath.h"
 #include "minecraft/network/packet/ComplexItemDataPacket.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/item/MilkBucketItem.cpp b/targets/minecraft/world/item/MilkBucketItem.cpp
index c21fbefdc..46ee9a417 100644
--- a/targets/minecraft/world/item/MilkBucketItem.cpp
+++ b/targets/minecraft/world/item/MilkBucketItem.cpp
@@ -1,6 +1,7 @@
+#include "MilkBucketItem.h"
+
 #include <memory>
 
-#include "MilkBucketItem.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/MinecartItem.cpp b/targets/minecraft/world/item/MinecartItem.cpp
index 2693eacc1..bd58be3d0 100644
--- a/targets/minecraft/world/item/MinecartItem.cpp
+++ b/targets/minecraft/world/item/MinecartItem.cpp
@@ -1,7 +1,8 @@
+#include "MinecartItem.h"
+
 #include <memory>
 #include <string>
 
-#include "MinecartItem.h"
 #include "java/Class.h"
 #include "minecraft/core/BehaviorRegistry.h"
 #include "minecraft/core/BlockSource.h"
diff --git a/targets/minecraft/world/item/MultiTextureTileItem.cpp b/targets/minecraft/world/item/MultiTextureTileItem.cpp
index b3883a469..8f4dd3be5 100644
--- a/targets/minecraft/world/item/MultiTextureTileItem.cpp
+++ b/targets/minecraft/world/item/MultiTextureTileItem.cpp
@@ -1,10 +1,11 @@
+#include "MultiTextureTileItem.h"
+
 #include <memory>
 
-#include "minecraft/world/level/tile/Tile.h"
-#include "MultiTextureTileItem.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/TileItem.h"
 #include "minecraft/world/item/crafting/Recipes.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 MultiTextureTileItem::MultiTextureTileItem(int id, Tile* parentTile,
                                            int* nameExtensions, int iLength,
diff --git a/targets/minecraft/world/item/NameTagItem.cpp b/targets/minecraft/world/item/NameTagItem.cpp
index 2eb02397f..07912462c 100644
--- a/targets/minecraft/world/item/NameTagItem.cpp
+++ b/targets/minecraft/world/item/NameTagItem.cpp
@@ -1,7 +1,8 @@
+#include "NameTagItem.h"
+
 #include <memory>
 #include <string>
 
-#include "NameTagItem.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
diff --git a/targets/minecraft/world/item/PickaxeItem.cpp b/targets/minecraft/world/item/PickaxeItem.cpp
index 2abfa6fcc..ac9cc5834 100644
--- a/targets/minecraft/world/item/PickaxeItem.cpp
+++ b/targets/minecraft/world/item/PickaxeItem.cpp
@@ -1,7 +1,8 @@
+#include "PickaxeItem.h"
+
 #include <memory>
 #include <vector>
 
-#include "PickaxeItem.h"
 #include "minecraft/world/item/DiggerItem.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/HalfSlabTile.h"
diff --git a/targets/minecraft/world/item/PistonTileItem.cpp b/targets/minecraft/world/item/PistonTileItem.cpp
index 27cc2378a..9f5126ae1 100644
--- a/targets/minecraft/world/item/PistonTileItem.cpp
+++ b/targets/minecraft/world/item/PistonTileItem.cpp
@@ -1,4 +1,5 @@
 #include "PistonTileItem.h"
+
 #include "minecraft/world/item/TileItem.h"
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
 
diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp
index 7844f6119..3e1f4771b 100644
--- a/targets/minecraft/world/item/PlanterTileItem.cpp
+++ b/targets/minecraft/world/item/PlanterTileItem.cpp
@@ -1,10 +1,11 @@
+#include "PlanterTileItem.h"
+
 #include <memory>
 
-#include "PlanterTileItem.h"
-#include "minecraft/stats/GenericStats.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/Facing.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp
index 6e4c81566..68ca25252 100644
--- a/targets/minecraft/world/item/PotionItem.cpp
+++ b/targets/minecraft/world/item/PotionItem.cpp
@@ -1,19 +1,19 @@
-#include "minecraft/stdafx.h"
+#include "PotionItem.h"
 
-#include "net.minecraft.world.item.h"
-#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/effect/MobEffectInstance.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/effect/MobEffectInstance.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/SharedConstants.h"
-#include "PotionItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "net.minecraft.world.item.h"
 
 const std::wstring PotionItem::DEFAULT_ICON = L"potion";
 const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash";
diff --git a/targets/minecraft/world/item/RecordingItem.cpp b/targets/minecraft/world/item/RecordingItem.cpp
index 821205bc9..ee6ecd9e9 100644
--- a/targets/minecraft/world/item/RecordingItem.cpp
+++ b/targets/minecraft/world/item/RecordingItem.cpp
@@ -1,11 +1,13 @@
+#include "RecordingItem.h"
+
 #include <wchar.h>
+
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "RecordingItem.h"
-#include "minecraft/stats/GenericStats.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/HtmlString.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/item/RedStoneItem.cpp b/targets/minecraft/world/item/RedStoneItem.cpp
index 6890c3a0e..f81b1f8b1 100644
--- a/targets/minecraft/world/item/RedStoneItem.cpp
+++ b/targets/minecraft/world/item/RedStoneItem.cpp
@@ -1,7 +1,8 @@
+#include "RedStoneItem.h"
+
 #include <memory>
 
 #include "minecraft/stats/GenericStats.h"
-#include "RedStoneItem.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/SaddleItem.cpp b/targets/minecraft/world/item/SaddleItem.cpp
index 983537b96..3e91f56e2 100644
--- a/targets/minecraft/world/item/SaddleItem.cpp
+++ b/targets/minecraft/world/item/SaddleItem.cpp
@@ -1,6 +1,7 @@
+#include "SaddleItem.h"
+
 #include <memory>
 
-#include "SaddleItem.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/animal/Pig.h"
diff --git a/targets/minecraft/world/item/SaplingTileItem.cpp b/targets/minecraft/world/item/SaplingTileItem.cpp
index 8cf44d3ce..8a2f0fdc1 100644
--- a/targets/minecraft/world/item/SaplingTileItem.cpp
+++ b/targets/minecraft/world/item/SaplingTileItem.cpp
@@ -1,7 +1,8 @@
+#include "SaplingTileItem.h"
+
 #include <memory>
 
 #include "TileItem.h"
-#include "SaplingTileItem.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/SaplingPlantTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/item/SeedFoodItem.cpp b/targets/minecraft/world/item/SeedFoodItem.cpp
index 67450d3d8..39f6cdb10 100644
--- a/targets/minecraft/world/item/SeedFoodItem.cpp
+++ b/targets/minecraft/world/item/SeedFoodItem.cpp
@@ -1,6 +1,7 @@
+#include "SeedFoodItem.h"
+
 #include <memory>
 
-#include "SeedFoodItem.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/FoodItem.h"
diff --git a/targets/minecraft/world/item/SeedItem.cpp b/targets/minecraft/world/item/SeedItem.cpp
index 9a2033825..588c107a4 100644
--- a/targets/minecraft/world/item/SeedItem.cpp
+++ b/targets/minecraft/world/item/SeedItem.cpp
@@ -1,8 +1,9 @@
 
+#include "SeedItem.h"
+
 #include <memory>
 
 #include "Item.h"
-#include "SeedItem.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/item/ShearsItem.cpp b/targets/minecraft/world/item/ShearsItem.cpp
index 9fbd2c2fb..e9f6d4290 100644
--- a/targets/minecraft/world/item/ShearsItem.cpp
+++ b/targets/minecraft/world/item/ShearsItem.cpp
@@ -1,9 +1,10 @@
+#include "ShearsItem.h"
+
 #include <memory>
 
-#include "ShearsItem.h"
-#include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 ShearsItem::ShearsItem(int itemId) : Item(itemId) {
     setMaxStackSize(1);
diff --git a/targets/minecraft/world/item/ShovelItem.cpp b/targets/minecraft/world/item/ShovelItem.cpp
index 328965b55..316f05899 100644
--- a/targets/minecraft/world/item/ShovelItem.cpp
+++ b/targets/minecraft/world/item/ShovelItem.cpp
@@ -1,6 +1,7 @@
+#include "ShovelItem.h"
+
 #include <vector>
 
-#include "ShovelItem.h"
 #include "minecraft/world/item/DiggerItem.h"
 #include "minecraft/world/level/tile/GrassTile.h"
 #include "minecraft/world/level/tile/MycelTile.h"
diff --git a/targets/minecraft/world/item/SignItem.cpp b/targets/minecraft/world/item/SignItem.cpp
index 157e082bb..a862f622f 100644
--- a/targets/minecraft/world/item/SignItem.cpp
+++ b/targets/minecraft/world/item/SignItem.cpp
@@ -1,6 +1,7 @@
+#include "SignItem.h"
+
 #include <memory>
 
-#include "SignItem.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/item/SimpleFoiledItem.cpp b/targets/minecraft/world/item/SimpleFoiledItem.cpp
index 295eb9458..059b94dc9 100644
--- a/targets/minecraft/world/item/SimpleFoiledItem.cpp
+++ b/targets/minecraft/world/item/SimpleFoiledItem.cpp
@@ -1,6 +1,7 @@
+#include "SimpleFoiledItem.h"
+
 #include <memory>
 
-#include "SimpleFoiledItem.h"
 #include "minecraft/world/item/Item.h"
 
 SimpleFoiledItem::SimpleFoiledItem(int id) : Item(id) {}
diff --git a/targets/minecraft/world/item/SkullItem.cpp b/targets/minecraft/world/item/SkullItem.cpp
index 1460a8290..c9d407cc9 100644
--- a/targets/minecraft/world/item/SkullItem.cpp
+++ b/targets/minecraft/world/item/SkullItem.cpp
@@ -1,11 +1,12 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "SkullItem.h"
+
+#include "minecraft/net.minecraft.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
 
 const unsigned int SkullItem::NAMES[SKULL_COUNT] = {
     IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_WITHER, IDS_ITEM_SKULL_ZOMBIE,
diff --git a/targets/minecraft/world/item/SnowItem.cpp b/targets/minecraft/world/item/SnowItem.cpp
index f8b889105..856bc68fe 100644
--- a/targets/minecraft/world/item/SnowItem.cpp
+++ b/targets/minecraft/world/item/SnowItem.cpp
@@ -1,7 +1,8 @@
+#include "SnowItem.h"
+
 #include <memory>
 #include <optional>
 
-#include "SnowItem.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/AuxDataTileItem.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/SnowballItem.cpp b/targets/minecraft/world/item/SnowballItem.cpp
index ac5b9df8f..91498a9b2 100644
--- a/targets/minecraft/world/item/SnowballItem.cpp
+++ b/targets/minecraft/world/item/SnowballItem.cpp
@@ -1,8 +1,9 @@
+#include "SnowballItem.h"
+
 #include <memory>
 
-#include "SnowballItem.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/projectile/Snowball.h"
diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp
index eb0bd29f2..8f61ac6e9 100644
--- a/targets/minecraft/world/item/SpawnEggItem.cpp
+++ b/targets/minecraft/world/item/SpawnEggItem.cpp
@@ -1,20 +1,19 @@
-#include "minecraft/stdafx.h"
+#include "SpawnEggItem.h"
 
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/net.minecraft.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/Difficulty.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/npc/net.minecraft.world.entity.npc.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/net.minecraft.world.h"
 #include "minecraft/world/phys/HitResult.h"
-#include "SpawnEggItem.h"
-#include "minecraft/world/Difficulty.h"
-#include "minecraft/util/Mth.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-
-#include "console_helpers/StringHelpers.h"
 
 SpawnEggItem::SpawnEggItem(int id) : Item(id) {
     setMaxStackSize(16);  // 4J-PB brought forward. It is 64 on PC, but we'll
diff --git a/targets/minecraft/world/item/StoneSlabTileItem.cpp b/targets/minecraft/world/item/StoneSlabTileItem.cpp
index 5a9f7dcc1..edb7afe11 100644
--- a/targets/minecraft/world/item/StoneSlabTileItem.cpp
+++ b/targets/minecraft/world/item/StoneSlabTileItem.cpp
@@ -1,6 +1,7 @@
+#include "StoneSlabTileItem.h"
+
 #include <optional>
 
-#include "StoneSlabTileItem.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp
index 3f4a33cb9..8bd70f847 100644
--- a/targets/minecraft/world/item/TileItem.cpp
+++ b/targets/minecraft/world/item/TileItem.cpp
@@ -1,12 +1,13 @@
 
 
+#include "TileItem.h"
+
 #include <string>
 
-#include "TileItem.h"
-#include "minecraft/Facing.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Class.h"
+#include "minecraft/Facing.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/Icon.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/item/WaterLilyTileItem.cpp b/targets/minecraft/world/item/WaterLilyTileItem.cpp
index 9798376cb..e9ae70465 100644
--- a/targets/minecraft/world/item/WaterLilyTileItem.cpp
+++ b/targets/minecraft/world/item/WaterLilyTileItem.cpp
@@ -1,6 +1,7 @@
+#include "WaterLilyTileItem.h"
+
 #include <memory>
 
-#include "WaterLilyTileItem.h"
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ColoredTileItem.h"
diff --git a/targets/minecraft/world/item/WeaponItem.cpp b/targets/minecraft/world/item/WeaponItem.cpp
index 2ee6e36eb..0dd8ed31a 100644
--- a/targets/minecraft/world/item/WeaponItem.cpp
+++ b/targets/minecraft/world/item/WeaponItem.cpp
@@ -1,6 +1,7 @@
+#include "WeaponItem.h"
+
 #include <memory>
 
-#include "WeaponItem.h"
 #include "minecraft/world/entity/ai/attributes/AttributeModifier.h"
 #include "minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/item/WoolTileItem.cpp b/targets/minecraft/world/item/WoolTileItem.cpp
index b4f31e389..c465432ec 100644
--- a/targets/minecraft/world/item/WoolTileItem.cpp
+++ b/targets/minecraft/world/item/WoolTileItem.cpp
@@ -1,8 +1,9 @@
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "ItemInstance.h"
-#include "DyePowderItem.h"
 #include "WoolTileItem.h"
 
+#include "DyePowderItem.h"
+#include "ItemInstance.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
 const unsigned int WoolTileItem::COLOR_DESCS[] = {
     IDS_TILE_CLOTH_BLACK,      IDS_TILE_CLOTH_RED,     IDS_TILE_CLOTH_GREEN,
     IDS_TILE_CLOTH_BROWN,      IDS_TILE_CLOTH_BLUE,    IDS_TILE_CLOTH_PURPLE,
diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp
index 41e605a42..dcce6949d 100644
--- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp
+++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp
@@ -1,9 +1,10 @@
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/effect/net.minecraft.world.effect.h"
+#include "PotionBrewing.h"
+
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/JavaMath.h"
 #include "minecraft/SharedConstants.h"
-#include "PotionBrewing.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/world/effect/net.minecraft.world.effect.h"
 
 const int PotionBrewing::DEFAULT_APPEARANCES[] = {
     IDS_POTION_PREFIX_MUNDANE,  IDS_POTION_PREFIX_UNINTERESTING,
diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.h b/targets/minecraft/world/item/alchemy/PotionBrewing.h
index ca8178d08..bdf632784 100644
--- a/targets/minecraft/world/item/alchemy/PotionBrewing.h
+++ b/targets/minecraft/world/item/alchemy/PotionBrewing.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 class MobEffectInstance;
 
 class PotionBrewing {
diff --git a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp
index 3404eb873..da460d6ff 100644
--- a/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp
+++ b/targets/minecraft/world/item/crafting/ArmorDyeRecipe.cpp
@@ -1,8 +1,10 @@
+#include "ArmorDyeRecipe.h"
+
 #include <string.h>
+
 #include <algorithm>
 #include <vector>
 
-#include "ArmorDyeRecipe.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "minecraft/world/entity/animal/Sheep.h"
diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp
index 45577f439..ac2effdd5 100644
--- a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp
@@ -1,9 +1,10 @@
 // package net.minecraft.world.item.crafting;
 
+#include "ArmorRecipes.h"
+
 #include <vector>
 
 #include "Recipes.h"
-#include "ArmorRecipes.h"
 #include "java/Class.h"
 #include "minecraft/world/item/ArmorItem.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.h b/targets/minecraft/world/item/crafting/ArmorRecipes.h
index ef044867e..6486b9432 100644
--- a/targets/minecraft/world/item/crafting/ArmorRecipes.h
+++ b/targets/minecraft/world/item/crafting/ArmorRecipes.h
@@ -6,6 +6,7 @@
 
 #include <format>
 #include <string>
+#include <vector>
 
 class Object;
 class Recipes;
diff --git a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp
index 8c3097787..63359ab1b 100644
--- a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp
@@ -1,7 +1,8 @@
+#include "ClothDyeRecipes.h"
+
 #include <vector>
 
 #include "Recipes.h"
-#include "ClothDyeRecipes.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/item/crafting/FireworksRecipe.cpp b/targets/minecraft/world/item/crafting/FireworksRecipe.cpp
index 8626f6e64..3c34c4622 100644
--- a/targets/minecraft/world/item/crafting/FireworksRecipe.cpp
+++ b/targets/minecraft/world/item/crafting/FireworksRecipe.cpp
@@ -1,14 +1,16 @@
+#include "FireworksRecipe.h"
+
 #include <stdint.h>
+
 #include <vector>
 
-#include "FireworksRecipe.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/world/inventory/CraftingContainer.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/FireworksItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 thread_local FireworksRecipe::ThreadStorage* FireworksRecipe::m_tlsStorage =
     nullptr;
diff --git a/targets/minecraft/world/item/crafting/FoodRecipes.cpp b/targets/minecraft/world/item/crafting/FoodRecipes.cpp
index 15f5cd62b..f072061c4 100644
--- a/targets/minecraft/world/item/crafting/FoodRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/FoodRecipes.cpp
@@ -1,9 +1,10 @@
-#include "minecraft/world/item/DyePowderItem.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "Recipes.h"
 #include "FoodRecipes.h"
+
+#include "Recipes.h"
+#include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 void FoodRecipies::addRecipes(Recipes* r) {
     // 4J-JEV: Bumped up in the list to avoid a colision with the title.
diff --git a/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp b/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp
index 02626adea..02795ab92 100644
--- a/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/FurnaceRecipes.cpp
@@ -1,11 +1,12 @@
+#include "FurnaceRecipes.h"
+
 #include <utility>
 
-#include "minecraft/world/level/tile/Tile.h"
-#include "FurnaceRecipes.h"
 #include "minecraft/world/item/CoalItem.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 FurnaceRecipes* FurnaceRecipes::instance = nullptr;
 
diff --git a/targets/minecraft/world/item/crafting/OreRecipes.cpp b/targets/minecraft/world/item/crafting/OreRecipes.cpp
index 4823cdeb5..ab3a9a14f 100644
--- a/targets/minecraft/world/item/crafting/OreRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/OreRecipes.cpp
@@ -1,10 +1,11 @@
-#include "minecraft/world/item/DyePowderItem.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "Recipes.h"
 #include "OreRecipes.h"
+
+#include "Recipes.h"
 #include "minecraft/world/item/CoalItem.h"
+#include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 void OreRecipies::_init() {
     ADD_OBJECT(map[0], Tile::goldBlock);
diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp
index 79093c42a..4645caf84 100644
--- a/targets/minecraft/world/item/crafting/Recipes.cpp
+++ b/targets/minecraft/world/item/crafting/Recipes.cpp
@@ -1,4 +1,7 @@
+#include "minecraft/world/item/crafting/Recipes.h"
+
 #include <stdarg.h>
+
 #include <format>
 #include <memory>
 #include <string>
@@ -6,17 +9,16 @@
 #include <utility>
 #include <vector>
 
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/inventory/CraftingContainer.h"
 #include "minecraft/world/item/CoalItem.h"
 #include "minecraft/world/item/Item.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/crafting/ArmorRecipes.h"
 #include "minecraft/world/item/crafting/ClothDyeRecipes.h"
 #include "minecraft/world/item/crafting/FireworksRecipe.h"
 #include "minecraft/world/item/crafting/FoodRecipes.h"
 #include "minecraft/world/item/crafting/OreRecipes.h"
-#include "minecraft/world/item/crafting/Recipes.h"
 #include "minecraft/world/item/crafting/Recipy.h"
 #include "minecraft/world/item/crafting/ShapedRecipy.h"
 #include "minecraft/world/item/crafting/ShapelessRecipy.h"
diff --git a/targets/minecraft/world/item/crafting/Recipy.h b/targets/minecraft/world/item/crafting/Recipy.h
index b352fcdf9..c53e15ed3 100644
--- a/targets/minecraft/world/item/crafting/Recipy.h
+++ b/targets/minecraft/world/item/crafting/Recipy.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "minecraft/world/inventory/CraftingContainer.h"
 #include "4J.Common/4J_Compat.h"
+#include "minecraft/world/inventory/CraftingContainer.h"
 
 #define RECIPE_TYPE_2x2 0
 #define RECIPE_TYPE_3x3 1
diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp
index 50a958054..12884f54d 100644
--- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp
+++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp
@@ -3,17 +3,18 @@
 // import net.minecraft.world.inventory.CraftingContainer;
 // import net.minecraft.world.item.ItemInstance;
 
+#include "ShapedRecipy.h"
+
 #include <string.h>
 
-#include "Recipy.h"
-#include "Recipes.h"
-#include "ShapedRecipy.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "nbt/CompoundTag.h"
+#include "Recipes.h"
+#include "Recipy.h"
 #include "minecraft/world/inventory/CraftingContainer.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "nbt/CompoundTag.h"
 
 // 4J-PB - for new crafting - Adding group to define type of item that the
 // recipe produces
diff --git a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp
index 2b442a145..46f23f086 100644
--- a/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp
+++ b/targets/minecraft/world/item/crafting/ShapelessRecipy.cpp
@@ -4,16 +4,18 @@
 //
 // import net.minecraft.world.inventory.CraftingContainer;
 // import net.minecraft.world.item.ItemInstance;
+#include "ShapelessRecipy.h"
+
 #include <string.h>
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
-#include "Recipy.h"
-#include "Recipes.h"
-#include "ShapelessRecipy.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Recipes.h"
+#include "Recipy.h"
 #include "minecraft/world/inventory/CraftingContainer.h"
 #include "minecraft/world/item/ItemInstance.h"
 
diff --git a/targets/minecraft/world/item/crafting/StructureRecipes.cpp b/targets/minecraft/world/item/crafting/StructureRecipes.cpp
index f9a8a3791..f7e53c924 100644
--- a/targets/minecraft/world/item/crafting/StructureRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/StructureRecipes.cpp
@@ -1,5 +1,6 @@
-#include "Recipes.h"
 #include "StructureRecipes.h"
+
+#include "Recipes.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/BeaconTile.h"
diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.cpp b/targets/minecraft/world/item/crafting/ToolRecipes.cpp
index 551019d8b..32f6f7374 100644
--- a/targets/minecraft/world/item/crafting/ToolRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/ToolRecipes.cpp
@@ -1,12 +1,13 @@
+#include "ToolRecipes.h"
+
 #include <vector>
 
-#include "minecraft/world/level/tile/Tile.h"
 #include "Recipes.h"
-#include "ToolRecipes.h"
 #include "java/Class.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/ShearsItem.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 // 4J-PB - adding "" on the end of these so we can detect it
 std::wstring ToolRecipies::shapes[][4] = {
diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.h b/targets/minecraft/world/item/crafting/ToolRecipes.h
index 4e6ebbcd4..9a1f93239 100644
--- a/targets/minecraft/world/item/crafting/ToolRecipes.h
+++ b/targets/minecraft/world/item/crafting/ToolRecipes.h
@@ -6,6 +6,7 @@
 
 #include <format>
 #include <string>
+#include <vector>
 
 #define MAX_TOOL_RECIPES 5
 
diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp
index 9b0cd52ce..76d2bd1fa 100644
--- a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp
+++ b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp
@@ -1,11 +1,12 @@
+#include "WeaponRecipes.h"
+
 #include <vector>
 
-#include "minecraft/world/level/tile/Tile.h"
 #include "Recipes.h"
-#include "WeaponRecipes.h"
 #include "java/Class.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/Tile.h"
 
 // 4J-PB - adding "" on the end of these so we can detect it
 std::wstring WeaponRecipies::shapes[][4] = {
diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.h b/targets/minecraft/world/item/crafting/WeaponRecipes.h
index b1f429c05..bc5a50668 100644
--- a/targets/minecraft/world/item/crafting/WeaponRecipes.h
+++ b/targets/minecraft/world/item/crafting/WeaponRecipes.h
@@ -7,6 +7,7 @@
 
 #include <format>
 #include <string>
+#include <vector>
 
 class Object;
 class Recipes;
diff --git a/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h b/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h
index 7224068c7..1bc8b2d02 100644
--- a/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h
+++ b/targets/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "Recipes.h"
-#include "Recipy.h"
 #include "ArmorDyeRecipe.h"
 #include "ArmorRecipes.h"
 #include "ClothDyeRecipes.h"
-#include "FoodRecipes.h"
 #include "FireworksRecipe.h"
+#include "FoodRecipes.h"
 #include "FurnaceRecipes.h"
 #include "OreRecipes.h"
+#include "Recipes.h"
+#include "Recipy.h"
 #include "ShapedRecipy.h"
 #include "ShapelessRecipy.h"
 #include "StructureRecipes.h"
diff --git a/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp b/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp
index 19fe70844..4e8dd9275 100644
--- a/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/DamageEnchantment.cpp
@@ -1,7 +1,7 @@
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "DamageEnchantment.h"
 
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "strings.h"
 
 const int DamageEnchantment::names[] = {IDS_ENCHANTMENT_DAMAGE_ALL,
diff --git a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp
index 93c636705..d250a11d1 100644
--- a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.cpp
@@ -1,7 +1,7 @@
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "DigDurabilityEnchantment.h"
-#include "java/Random.h"
 
+#include "java/Random.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "strings.h"
 
 DigDurabilityEnchantment::DigDurabilityEnchantment(int id, int frequency)
diff --git a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h
index 4bf76197f..23237a1e7 100644
--- a/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h
+++ b/targets/minecraft/world/item/enchantment/DigDurabilityEnchantment.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Enchantment.h"
-
 #include "java/Random.h"
 
 class DigDurabilityEnchantment : public Enchantment {
diff --git a/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp b/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp
index 6c6987d0a..7394eac67 100644
--- a/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/DiggingEnchantment.cpp
@@ -1,6 +1,6 @@
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "DiggingEnchantment.h"
 
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "strings.h"
 
 DiggingEnchantment::DiggingEnchantment(int id, int frequency)
diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp
index 4bd6e4448..52c5e9a73 100644
--- a/targets/minecraft/world/item/enchantment/Enchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp
@@ -1,9 +1,8 @@
-#include "minecraft/stdafx.h"
-
-#include "net.minecraft.world.item.enchantment.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "Enchantment.h"
 
+#include "minecraft/stdafx.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "net.minecraft.world.item.enchantment.h"
 #include "strings.h"
 
 // Enchantment *Enchantment::enchantments[256];
diff --git a/targets/minecraft/world/item/enchantment/Enchantment.h b/targets/minecraft/world/item/enchantment/Enchantment.h
index 00af596bb..cfa099272 100644
--- a/targets/minecraft/world/item/enchantment/Enchantment.h
+++ b/targets/minecraft/world/item/enchantment/Enchantment.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 #include <string>
-#include <string>
 
 #include "EnchantmentCategory.h"
 #include "minecraft/util/HtmlString.h"
diff --git a/targets/minecraft/world/item/enchantment/EnchantmentCategory.cpp b/targets/minecraft/world/item/enchantment/EnchantmentCategory.cpp
index f7fde8058..425791627 100644
--- a/targets/minecraft/world/item/enchantment/EnchantmentCategory.cpp
+++ b/targets/minecraft/world/item/enchantment/EnchantmentCategory.cpp
@@ -1,4 +1,5 @@
 #include "EnchantmentCategory.h"
+
 #include "minecraft/world/item/ArmorItem.h"
 #include "minecraft/world/item/BowItem.h"
 #include "minecraft/world/item/DiggerItem.h"
diff --git a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp
index 61a4f6a0c..b1c08938a 100644
--- a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp
+++ b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp
@@ -1,12 +1,11 @@
+#include "EnchantmentHelper.h"
+
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "EnchantmentHelper.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/util/WeighedRandom.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
@@ -15,6 +14,8 @@
 #include "minecraft/world/item/enchantment/Enchantment.h"
 #include "minecraft/world/item/enchantment/EnchantmentCategory.h"
 #include "minecraft/world/item/enchantment/EnchantmentInstance.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 Random EnchantmentHelper::random;
 
diff --git a/targets/minecraft/world/item/enchantment/EnchantmentHelper.h b/targets/minecraft/world/item/enchantment/EnchantmentHelper.h
index f7f5a8a23..408aaebb3 100644
--- a/targets/minecraft/world/item/enchantment/EnchantmentHelper.h
+++ b/targets/minecraft/world/item/enchantment/EnchantmentHelper.h
@@ -3,12 +3,14 @@
 #include <format>
 #include <memory>
 #include <unordered_map>
+#include <vector>
 
 class ItemInstance;
 class Inventory;
 class DamageSource;
 class Enchantment;
 class EnchantmentInstance;
+class Entity;
 class LivingEntity;
 class Random;
 
diff --git a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp
index 6d76a3917..4bc047e7b 100644
--- a/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp
+++ b/targets/minecraft/world/item/enchantment/EnchantmentInstance.cpp
@@ -1,8 +1,8 @@
+#include "EnchantmentInstance.h"
+
 #include <vector>
 
-#include "EnchantmentInstance.h"
 #include "minecraft/world/item/enchantment/Enchantment.h"
-
 #include "strings.h"
 
 EnchantmentInstance::EnchantmentInstance(Enchantment* enchantment, int level)
diff --git a/targets/minecraft/world/item/enchantment/EnchantmentInstance.h b/targets/minecraft/world/item/enchantment/EnchantmentInstance.h
index 6403f0785..fe84f57ea 100644
--- a/targets/minecraft/world/item/enchantment/EnchantmentInstance.h
+++ b/targets/minecraft/world/item/enchantment/EnchantmentInstance.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "minecraft/util/WeighedRandom.h"
 #include "minecraft/util/WeighedRandom.h"
 
 class Enchantment;
diff --git a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp
index add1224e9..dd3927d76 100644
--- a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
-#include "net.minecraft.world.item.enchantment.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/util/Mth.h"
 #include "ProtectionEnchantment.h"
 
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "net.minecraft.world.item.enchantment.h"
 #include "strings.h"
 
 const int ProtectionEnchantment::names[] = {
diff --git a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.h b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.h
index 70c44affb..a0eee5c8d 100644
--- a/targets/minecraft/world/item/enchantment/ProtectionEnchantment.h
+++ b/targets/minecraft/world/item/enchantment/ProtectionEnchantment.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include <memory>
+
 #include "Enchantment.h"
 
+class Entity;
+
 class ProtectionEnchantment : public Enchantment {
 public:
     static const int ALL = 0;
diff --git a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp
index 00b41727f..4afe10083 100644
--- a/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/ThornsEnchantment.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "net.minecraft.world.item.enchantment.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
-#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
 #include "ThornsEnchantment.h"
 
+#include "minecraft/world/damageSource/net.minecraft.world.damagesource.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "net.minecraft.world.item.enchantment.h"
 #include "strings.h"
 
 const float ThornsEnchantment::CHANCE_PER_LEVEl = 0.15f;
diff --git a/targets/minecraft/world/item/enchantment/ThornsEnchantment.h b/targets/minecraft/world/item/enchantment/ThornsEnchantment.h
index 596943d89..b3fd8a954 100644
--- a/targets/minecraft/world/item/enchantment/ThornsEnchantment.h
+++ b/targets/minecraft/world/item/enchantment/ThornsEnchantment.h
@@ -1,7 +1,12 @@
 #pragma once
 
+#include <memory>
+
 #include "Enchantment.h"
 
+class Random;
+class Entity;
+
 class ThornsEnchantment : public Enchantment {
 private:
     static const float CHANCE_PER_LEVEl;
diff --git a/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp b/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp
index 51f15d133..6517d85f2 100644
--- a/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp
+++ b/targets/minecraft/world/item/enchantment/UntouchingEnchantment.cpp
@@ -1,6 +1,6 @@
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "UntouchingEnchantment.h"
 
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "strings.h"
 
 UntouchingEnchantment::UntouchingEnchantment(int id, int frequency)
diff --git a/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h b/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h
index c0df52265..28ab0ac3a 100644
--- a/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h
+++ b/targets/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h
@@ -20,5 +20,4 @@
 #include "ArrowFireEnchantment.h"
 #include "ArrowInfiniteEnchantment.h"
 #include "ArrowKnockbackEnchantment.h"
-
 #include "ThornsEnchantment.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/item/net.minecraft.world.item.h b/targets/minecraft/world/item/net.minecraft.world.item.h
index a674ec586..1132a8b13 100644
--- a/targets/minecraft/world/item/net.minecraft.world.item.h
+++ b/targets/minecraft/world/item/net.minecraft.world.item.h
@@ -6,7 +6,6 @@
 #include "BowItem.h"
 #include "BowlFoodItem.h"
 #include "BucketItem.h"
-#include "WoolTileItem.h"
 #include "CoalItem.h"
 #include "ComplexItem.h"
 #include "DiggerItem.h"
@@ -23,9 +22,11 @@
 #include "LeafTileItem.h"
 #include "MapItem.h"
 #include "MinecartItem.h"
+#include "WoolTileItem.h"
 // #include "PaintingItem.h"
 #include "PickaxeItem.h"
 #include "PistonTileItem.h"
+#include "PlanterTileItem.h"
 #include "RecordingItem.h"
 #include "RedStoneItem.h"
 #include "SaddleItem.h"
@@ -37,7 +38,6 @@
 #include "SnowballItem.h"
 #include "StoneSlabTileItem.h"
 #include "TileItem.h"
-#include "PlanterTileItem.h"
 #include "WeaponItem.h"
 
 // 1.8.2
@@ -49,18 +49,18 @@
 #include "BottleItem.h"
 #include "EnderEyeItem.h"
 #include "EnderpearlItem.h"
+#include "ExperienceItem.h"  // 4J Stu brought forward
 #include "GoldenAppleItem.h"
 #include "MilkBucketItem.h"
 #include "PotionItem.h"
 #include "Rarity.h"
 #include "WaterLilyTileItem.h"
-#include "ExperienceItem.h"  // 4J Stu brought forward
 
 // TU9
 #include "FireChargeItem.h"
-#include "minecraft/world/entity/ItemFrame.h"
-#include "SpawnEggItem.h"
 #include "MultiTextureTileItem.h"
+#include "SpawnEggItem.h"
+#include "minecraft/world/entity/ItemFrame.h"
 
 // TU12
 #include "SkullItem.h"
@@ -73,13 +73,13 @@
 #include "SeedFoodItem.h"
 
 // 1.6.4
+#include "EmptyMapItem.h"
 #include "FireworksChargeItem.h"
 #include "FireworksItem.h"
 #include "LeashItem.h"
 #include "NameTagItem.h"
 #include "SimpleFoiledItem.h"
 #include "SnowItem.h"
-#include "EmptyMapItem.h"
 
 // 4J Added
 #include "ClockItem.h"
diff --git a/targets/minecraft/world/item/trading/MerchantRecipe.cpp b/targets/minecraft/world/item/trading/MerchantRecipe.cpp
index 9169ae7bb..46d594c22 100644
--- a/targets/minecraft/world/item/trading/MerchantRecipe.cpp
+++ b/targets/minecraft/world/item/trading/MerchantRecipe.cpp
@@ -1,6 +1,7 @@
+#include "MerchantRecipe.h"
+
 #include <string>
 
-#include "MerchantRecipe.h"
 #include "nbt/CompoundTag.h"
 
 class Item;
diff --git a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp
index 4e0127543..6ffddd8ca 100644
--- a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp
+++ b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp
@@ -1,14 +1,16 @@
+#include "MerchantRecipeList.h"
+
 #include <stdint.h>
+
 #include <string>
 
-#include "MerchantRecipeList.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/network/packet/Packet.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/trading/MerchantRecipe.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 MerchantRecipeList::MerchantRecipeList() {}
 
diff --git a/targets/minecraft/world/item/trading/MerchantRecipeList.h b/targets/minecraft/world/item/trading/MerchantRecipeList.h
index 38dc86aef..b0ed4168e 100644
--- a/targets/minecraft/world/item/trading/MerchantRecipeList.h
+++ b/targets/minecraft/world/item/trading/MerchantRecipeList.h
@@ -1,7 +1,8 @@
 #pragma once
 #include <stddef.h>
-#include <vector>
+
 #include <memory>
+#include <vector>
 
 class MerchantRecipe;
 class CompoundTag;
diff --git a/targets/minecraft/world/level/BaseMobSpawner.cpp b/targets/minecraft/world/level/BaseMobSpawner.cpp
index 01eb0e793..4ace4ecf4 100644
--- a/targets/minecraft/world/level/BaseMobSpawner.cpp
+++ b/targets/minecraft/world/level/BaseMobSpawner.cpp
@@ -1,20 +1,21 @@
+#include "BaseMobSpawner.h"
+
 #include <vector>
 
-#include "BaseMobSpawner.h"
-#include "minecraft/world/level/BaseMobSpawner.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/Tag.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/Mob.h"
 #include "minecraft/world/entity/item/Minecart.h"
+#include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/LevelEvent.h"
 #include "minecraft/world/phys/AABB.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/Tag.h"
 
 BaseMobSpawner::BaseMobSpawner() {
     spawnPotentials = nullptr;
diff --git a/targets/minecraft/world/level/BaseMobSpawner.h b/targets/minecraft/world/level/BaseMobSpawner.h
index 5741f0119..d4554ed7b 100644
--- a/targets/minecraft/world/level/BaseMobSpawner.h
+++ b/targets/minecraft/world/level/BaseMobSpawner.h
@@ -4,7 +4,6 @@
 #include <memory>
 #include <string>
 
-#include "minecraft/util/WeighedRandom.h"
 #include "minecraft/util/WeighedRandom.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/level/Calendar.cpp b/targets/minecraft/world/level/Calendar.cpp
index 59d0a1be1..3e1f816ca 100644
--- a/targets/minecraft/world/level/Calendar.cpp
+++ b/targets/minecraft/world/level/Calendar.cpp
@@ -1,7 +1,7 @@
-#include <time.h>
-
 #include "Calendar.h"
 
+#include <time.h>
+
 unsigned int Calendar::GetDayOfMonth() {
     time_t t = time(0);
     struct tm* now = localtime(&t);
diff --git a/targets/minecraft/world/level/ChunkPos.cpp b/targets/minecraft/world/level/ChunkPos.cpp
index 223f613c8..7ea241092 100644
--- a/targets/minecraft/world/level/ChunkPos.cpp
+++ b/targets/minecraft/world/level/ChunkPos.cpp
@@ -1,9 +1,11 @@
 
+#include "minecraft/world/level/ChunkPos.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 
-#include "minecraft/world/level/ChunkPos.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/ChunkPos.h"
diff --git a/targets/minecraft/world/level/ChunkPos.h b/targets/minecraft/world/level/ChunkPos.h
index e38a551a5..becabfc14 100644
--- a/targets/minecraft/world/level/ChunkPos.h
+++ b/targets/minecraft/world/level/ChunkPos.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <memory>
+
 class Entity;
 class TilePos;
 
diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp
index 90d301978..3c822d202 100644
--- a/targets/minecraft/world/level/Explosion.cpp
+++ b/targets/minecraft/world/level/Explosion.cpp
@@ -1,14 +1,19 @@
+#include "Explosion.h"
+
 #include <math.h>
 #include <stddef.h>
+
 #include <utility>
 #include <vector>
 
-#include "Explosion.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/damageSource/DamageSource.h"
 #include "minecraft/world/entity/Entity.h"
@@ -18,9 +23,6 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 Explosion::Explosion(Level* level, std::shared_ptr<Entity> source, double x,
                      double y, double z, float r) {
diff --git a/targets/minecraft/world/level/Explosion.h b/targets/minecraft/world/level/Explosion.h
index b356235e9..d07604a3b 100644
--- a/targets/minecraft/world/level/Explosion.h
+++ b/targets/minecraft/world/level/Explosion.h
@@ -5,8 +5,8 @@
 #include <unordered_set>
 
 #include "TilePos.h"
-#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/TilePos.h"
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/world/level/FoliageColor.cpp b/targets/minecraft/world/level/FoliageColor.cpp
index f17532c5e..8a51ec121 100644
--- a/targets/minecraft/world/level/FoliageColor.cpp
+++ b/targets/minecraft/world/level/FoliageColor.cpp
@@ -1,7 +1,8 @@
-#include "minecraft/client/Minecraft.h"
 #include "FoliageColor.h"
+
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "minecraft/client/Minecraft.h"
 
 // 4J Stu - Don't use this any more
 // std::vector<int> FoliageColor::pixels;
diff --git a/targets/minecraft/world/level/GameRules.cpp b/targets/minecraft/world/level/GameRules.cpp
index f583d82be..88f3df225 100644
--- a/targets/minecraft/world/level/GameRules.cpp
+++ b/targets/minecraft/world/level/GameRules.cpp
@@ -1,6 +1,7 @@
+#include "GameRules.h"
+
 #include <assert.h>
 
-#include "GameRules.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp
index 6ed976068..b12f9e829 100644
--- a/targets/minecraft/world/level/Level.cpp
+++ b/targets/minecraft/world/level/Level.cpp
@@ -1,33 +1,37 @@
+#include "Level.h"
+
 #include <stdlib.h>
 #include <wchar.h>
-#include <mutex>
+
+#include <algorithm>
 #include <cmath>
 #include <cstdint>
 #include <limits>
-#include <optional>
-#include <algorithm>
+#include <mutex>
 #include <numbers>
+#include <optional>
 
 #include "Explosion.h"
 #include "LevelListener.h"
-#include "Level.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/client/renderer/LevelRenderer.h"
-#include "Minecraft.Client/include/FrameProfiler.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
+#include "Minecraft.Client/include/FrameProfiler.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
 #include "minecraft/Pos.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/client/renderer/LevelRenderer.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Difficulty.h"
@@ -47,6 +51,7 @@
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/pathfinder/PathFinder.h"
 #include "minecraft/world/level/redstone/Redstone.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/storage/LevelStorage.h"
 #include "minecraft/world/level/storage/SavedDataStorage.h"
@@ -64,9 +69,6 @@
 #include "minecraft/world/phys/HitResult.h"
 #include "minecraft/world/phys/Vec3.h"
 #include "minecraft/world/scores/Scoreboard.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 class CompoundTag;
diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h
index 9bf6b6a4b..2991f9566 100644
--- a/targets/minecraft/world/level/Level.h
+++ b/targets/minecraft/world/level/Level.h
@@ -2,27 +2,27 @@
 
 #include <cstdint>
 // #include <mutex>
-#include <unordered_set>
 #include <format>
 #include <memory>
 #include <string>
 #include <typeinfo>
+#include <unordered_set>
 #include <vector>
 
+#include "4J.Common/4J_Compat.h"
+#include "ChunkPos.h"
 #include "LevelSource.h"
 #include "LightLayer.h"
-#include "ChunkPos.h"
 #include "TickNextTickData.h"
-#include "minecraft/world/level/saveddata/SavedData.h"
-#include "console_helpers/Definitions.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/world/level/biome/Biome.h"
 #include "console_helpers/C4JThread.h"
-#include "4J.Common/4J_Compat.h"
+#include "console_helpers/Definitions.h"
 #include "java/Class.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/LightLayer.h"
+#include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/saveddata/SavedData.h"
 #include "minecraft/world/phys/AABB.h"
 
 class CompoundTag;
diff --git a/targets/minecraft/world/level/LevelListener.h b/targets/minecraft/world/level/LevelListener.h
index ad22d92a6..5b075623d 100644
--- a/targets/minecraft/world/level/LevelListener.h
+++ b/targets/minecraft/world/level/LevelListener.h
@@ -1,8 +1,8 @@
 #pragma once
 
 class TileEntity;
-#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/world/entity/player/Player.h"
 
 class LevelListener {
 public:
diff --git a/targets/minecraft/world/level/LevelSettings.cpp b/targets/minecraft/world/level/LevelSettings.cpp
index 74714bb85..ebdbce5b8 100644
--- a/targets/minecraft/world/level/LevelSettings.cpp
+++ b/targets/minecraft/world/level/LevelSettings.cpp
@@ -1,4 +1,5 @@
 #include "LevelSettings.h"
+
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/level/storage/LevelData.h"
 
diff --git a/targets/minecraft/world/level/LevelSettings.h b/targets/minecraft/world/level/LevelSettings.h
index f60c82498..30a20bf30 100644
--- a/targets/minecraft/world/level/LevelSettings.h
+++ b/targets/minecraft/world/level/LevelSettings.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <string>
 
 class LevelType;
diff --git a/targets/minecraft/world/level/LevelType.cpp b/targets/minecraft/world/level/LevelType.cpp
index 8cc10f380..c1026eea2 100644
--- a/targets/minecraft/world/level/LevelType.cpp
+++ b/targets/minecraft/world/level/LevelType.cpp
@@ -10,10 +10,10 @@
 // 	private bool selectable;
 // 	private bool replacement;
 
-#include <string>
-
 #include "minecraft/world/level/LevelType.h"
 
+#include <string>
+
 LevelType* LevelType::levelTypes[16];  // = new LevelType[16];
 LevelType* LevelType::lvl_normal =
     nullptr;  // = new LevelType(0, "default", 1).setHasReplacement();
diff --git a/targets/minecraft/world/level/MobSpawner.cpp b/targets/minecraft/world/level/MobSpawner.cpp
index 6e4e7b353..340c7d4d4 100644
--- a/targets/minecraft/world/level/MobSpawner.cpp
+++ b/targets/minecraft/world/level/MobSpawner.cpp
@@ -1,15 +1,15 @@
+#include "MobSpawner.h"
+
 #include <utility>
 #include <vector>
 
-#include "minecraft/world/Difficulty.h"
 #include "Level.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "MobSpawner.h"
-#include "minecraft/world/level/dimension/Dimension.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/Pos.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/Difficulty.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/Mob.h"
@@ -17,6 +17,7 @@
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/PortalForcer.cpp b/targets/minecraft/world/level/PortalForcer.cpp
index 28e04a84d..dd5758e01 100644
--- a/targets/minecraft/world/level/PortalForcer.cpp
+++ b/targets/minecraft/world/level/PortalForcer.cpp
@@ -1,11 +1,12 @@
+#include "PortalForcer.h"
+
 #include <utility>
 
-#include "minecraft/server/level/ServerLevel.h"
-#include "PortalForcer.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/ChunkPos.h"
diff --git a/targets/minecraft/world/level/PortalForcer.h b/targets/minecraft/world/level/PortalForcer.h
index e55236542..0db9de0de 100644
--- a/targets/minecraft/world/level/PortalForcer.h
+++ b/targets/minecraft/world/level/PortalForcer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <unordered_map>
 #include <vector>
diff --git a/targets/minecraft/world/level/Region.cpp b/targets/minecraft/world/level/Region.cpp
index d60172d86..d517ce78e 100644
--- a/targets/minecraft/world/level/Region.cpp
+++ b/targets/minecraft/world/level/Region.cpp
@@ -1,13 +1,15 @@
+#include "Region.h"
+
 #include <stdlib.h>
 #include <string.h>
+
 #include <memory>
 #include <vector>
 
-#include "minecraft/world/level/material/Material.h"
 #include "Level.h"
-#include "Region.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/redstone/Redstone.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/Region.h b/targets/minecraft/world/level/Region.h
index 17937deb2..daefa41fe 100644
--- a/targets/minecraft/world/level/Region.h
+++ b/targets/minecraft/world/level/Region.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <format>
+#include <vector>
 
 #include "LevelSource.h"
 #include "minecraft/world/level/LevelSource.h"
@@ -11,6 +12,7 @@ class TileEntity;
 class BiomeSource;
 class Level;
 class LevelChunk;
+class ProgressListener;
 
 class Region : public LevelSource {
 private:
diff --git a/targets/minecraft/world/level/TickNextTickData.cpp b/targets/minecraft/world/level/TickNextTickData.cpp
index 2bf395d64..aad8ff784 100644
--- a/targets/minecraft/world/level/TickNextTickData.cpp
+++ b/targets/minecraft/world/level/TickNextTickData.cpp
@@ -1,6 +1,7 @@
+#include "TickNextTickData.h"
+
 #include <cstdint>
 
-#include "TickNextTickData.h"
 #include "minecraft/world/level/tile/Tile.h"
 
 int64_t TickNextTickData::C = 0;
diff --git a/targets/minecraft/world/level/TilePos.cpp b/targets/minecraft/world/level/TilePos.cpp
index b144b2661..39c966c73 100644
--- a/targets/minecraft/world/level/TilePos.cpp
+++ b/targets/minecraft/world/level/TilePos.cpp
@@ -1,6 +1,7 @@
 
 
 #include "minecraft/world/level/TilePos.h"
+
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/TilePos.h"
 #include "minecraft/world/phys/Vec3.h"
diff --git a/targets/minecraft/world/level/biome/BeachBiome.cpp b/targets/minecraft/world/level/biome/BeachBiome.cpp
index 01ab3c48c..bbf94afba 100644
--- a/targets/minecraft/world/level/biome/BeachBiome.cpp
+++ b/targets/minecraft/world/level/biome/BeachBiome.cpp
@@ -1,8 +1,10 @@
+#include "BeachBiome.h"
+
 #include <stdint.h>
+
 #include <vector>
 
 #include "BiomeDecorator.h"
-#include "BeachBiome.h"
 #include "minecraft/world/level/tile/Tile.h"
 
 BeachBiome::BeachBiome(int id) : Biome(id) {
diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp
index d0c0a7839..a177348aa 100644
--- a/targets/minecraft/world/level/biome/Biome.cpp
+++ b/targets/minecraft/world/level/biome/Biome.cpp
@@ -1,14 +1,16 @@
+#include "minecraft/world/level/biome/Biome.h"
+
 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/level/biome/Biome.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/entity/MobCategory.h"
 #include "minecraft/world/level/biome/BeachBiome.h"
 #include "minecraft/world/level/biome/Biome.h"
diff --git a/targets/minecraft/world/level/biome/Biome.h b/targets/minecraft/world/level/biome/Biome.h
index f95fe9b0d..bd29b43d1 100644
--- a/targets/minecraft/world/level/biome/Biome.h
+++ b/targets/minecraft/world/level/biome/Biome.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "minecraft/world/level/LevelSource.h"
-#include "minecraft/world/entity/Mob.h"
-#include "minecraft/util/WeighedRandom.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "minecraft/util/WeighedRandom.h"
+#include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/level/LevelSource.h"
 
 class Feature;
 class MobCategory;
diff --git a/targets/minecraft/world/level/biome/BiomeCache.cpp b/targets/minecraft/world/level/biome/BiomeCache.cpp
index d62042974..c15b6c9ab 100644
--- a/targets/minecraft/world/level/biome/BiomeCache.cpp
+++ b/targets/minecraft/world/level/biome/BiomeCache.cpp
@@ -1,7 +1,8 @@
+#include "BiomeCache.h"
+
 #include <utility>
 
 #include "BiomeSource.h"
-#include "BiomeCache.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
 BiomeCache::Block::Block(int x, int z, BiomeCache* parent) {
diff --git a/targets/minecraft/world/level/biome/BiomeCache.h b/targets/minecraft/world/level/biome/BiomeCache.h
index 0aebbd92d..23feb50be 100644
--- a/targets/minecraft/world/level/biome/BiomeCache.h
+++ b/targets/minecraft/world/level/biome/BiomeCache.h
@@ -1,7 +1,8 @@
 #pragma once
 #include <stdint.h>
-#include <mutex>
+
 #include <format>
+#include <mutex>
 #include <unordered_map>
 #include <vector>
 
diff --git a/targets/minecraft/world/level/biome/BiomeDecorator.cpp b/targets/minecraft/world/level/biome/BiomeDecorator.cpp
index 3e7cc62b9..903b88ee6 100644
--- a/targets/minecraft/world/level/biome/BiomeDecorator.cpp
+++ b/targets/minecraft/world/level/biome/BiomeDecorator.cpp
@@ -1,10 +1,14 @@
 
+#include "minecraft/world/level/biome/BiomeDecorator.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/biome/BiomeDecorator.h"
 #include "minecraft/world/level/biome/WaterlilyFeature.h"
 #include "minecraft/world/level/levelgen/feature/CactusFeature.h"
 #include "minecraft/world/level/levelgen/feature/ClayFeature.h"
@@ -18,9 +22,6 @@
 #include "minecraft/world/level/levelgen/feature/SandFeature.h"
 #include "minecraft/world/level/levelgen/feature/SpringFeature.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 BiomeDecorator::BiomeDecorator(Biome* biome) {
     _init();
diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp
index 15ba20050..f473fe11c 100644
--- a/targets/minecraft/world/level/biome/BiomeSource.cpp
+++ b/targets/minecraft/world/level/biome/BiomeSource.cpp
@@ -1,14 +1,14 @@
-#include "minecraft/stdafx.h"
-
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "net.minecraft.world.level.biome.h"
-#include "minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h"
-#include "java/System.h"
 #include "BiomeSource.h"
+
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "java/System.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/ProgressRenderer.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
+#include "net.minecraft.world.level.biome.h"
 #include "platform/PlatformServices.h"
 
 // 4J - removal of separate temperature & downfall layers brought forward
diff --git a/targets/minecraft/world/level/biome/BiomeSource.h b/targets/minecraft/world/level/biome/BiomeSource.h
index c18d6d2ee..6fcea0d97 100644
--- a/targets/minecraft/world/level/biome/BiomeSource.h
+++ b/targets/minecraft/world/level/biome/BiomeSource.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Biome.h"
-#include "BiomeSource.h"
 #include "BiomeCache.h"
+#include "BiomeSource.h"
 #include "minecraft/world/level/levelgen/synth/net.minecraft.world.level.levelgen.synth.h"
 
 class ChunkPos;
diff --git a/targets/minecraft/world/level/biome/DesertBiome.cpp b/targets/minecraft/world/level/biome/DesertBiome.cpp
index 23de097dd..687942a2e 100644
--- a/targets/minecraft/world/level/biome/DesertBiome.cpp
+++ b/targets/minecraft/world/level/biome/DesertBiome.cpp
@@ -1,4 +1,6 @@
 
+#include "minecraft/world/level/biome/DesertBiome.h"
+
 #include <cstdint>
 #include <vector>
 
@@ -6,7 +8,6 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/biome/BiomeDecorator.h"
-#include "minecraft/world/level/biome/DesertBiome.h"
 #include "minecraft/world/level/levelgen/feature/DesertWellFeature.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp b/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp
index 29b75ac51..7db14e1b4 100644
--- a/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp
+++ b/targets/minecraft/world/level/biome/ExtremeHillsBiome.cpp
@@ -1,6 +1,7 @@
+#include "ExtremeHillsBiome.h"
+
 #include <vector>
 
-#include "ExtremeHillsBiome.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
diff --git a/targets/minecraft/world/level/biome/FixedBiomeSource.cpp b/targets/minecraft/world/level/biome/FixedBiomeSource.cpp
index b14bce51a..d00a2e1ff 100644
--- a/targets/minecraft/world/level/biome/FixedBiomeSource.cpp
+++ b/targets/minecraft/world/level/biome/FixedBiomeSource.cpp
@@ -1,8 +1,9 @@
+#include "FixedBiomeSource.h"
+
 #include <algorithm>
 #include <vector>
 
 #include "java/Arrays.h"
-#include "FixedBiomeSource.h"
 #include "java/Random.h"
 #include "minecraft/world/level/TilePos.h"
 #include "minecraft/world/level/biome/Biome.h"
diff --git a/targets/minecraft/world/level/biome/FixedBiomeSource.h b/targets/minecraft/world/level/biome/FixedBiomeSource.h
index fd17106cf..f83269113 100644
--- a/targets/minecraft/world/level/biome/FixedBiomeSource.h
+++ b/targets/minecraft/world/level/biome/FixedBiomeSource.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 
 #include "BiomeSource.h"
diff --git a/targets/minecraft/world/level/biome/ForestBiome.cpp b/targets/minecraft/world/level/biome/ForestBiome.cpp
index d0e8e7e36..c8b1cb85c 100644
--- a/targets/minecraft/world/level/biome/ForestBiome.cpp
+++ b/targets/minecraft/world/level/biome/ForestBiome.cpp
@@ -1,6 +1,7 @@
+#include "ForestBiome.h"
+
 #include <vector>
 
-#include "ForestBiome.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/level/biome/BiomeDecorator.h"
diff --git a/targets/minecraft/world/level/biome/HellBiome.cpp b/targets/minecraft/world/level/biome/HellBiome.cpp
index cebb5df56..f2255c234 100644
--- a/targets/minecraft/world/level/biome/HellBiome.cpp
+++ b/targets/minecraft/world/level/biome/HellBiome.cpp
@@ -1,6 +1,7 @@
+#include "HellBiome.h"
+
 #include <vector>
 
-#include "HellBiome.h"
 #include "java/Class.h"
 
 HellBiome::HellBiome(int id) : Biome(id) {
diff --git a/targets/minecraft/world/level/biome/JungleBiome.cpp b/targets/minecraft/world/level/biome/JungleBiome.cpp
index 9618925d4..2360c48f4 100644
--- a/targets/minecraft/world/level/biome/JungleBiome.cpp
+++ b/targets/minecraft/world/level/biome/JungleBiome.cpp
@@ -1,6 +1,10 @@
+#include "JungleBiome.h"
+
 #include <vector>
 
-#include "JungleBiome.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
@@ -15,9 +19,6 @@
 #include "minecraft/world/level/tile/TallGrassPlantTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/TreeTile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 JungleBiome::JungleBiome(int id) : Biome(id) {
     decorator->treeCount = 50;
diff --git a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp
index 6b671eb30..1e5a2b4e5 100644
--- a/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp
+++ b/targets/minecraft/world/level/biome/MushroomIslandBiome.cpp
@@ -1,7 +1,9 @@
+#include "MushroomIslandBiome.h"
+
 #include <stdint.h>
+
 #include <vector>
 
-#include "MushroomIslandBiome.h"
 #include "BiomeDecorator.h"
 #include "java/Class.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/biome/PlainsBiome.cpp b/targets/minecraft/world/level/biome/PlainsBiome.cpp
index e3805bcd3..e615df1b4 100644
--- a/targets/minecraft/world/level/biome/PlainsBiome.cpp
+++ b/targets/minecraft/world/level/biome/PlainsBiome.cpp
@@ -1,10 +1,11 @@
 
+#include "minecraft/world/level/biome/PlainsBiome.h"
+
 #include <vector>
 
 #include "java/Class.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/biome/BiomeDecorator.h"
-#include "minecraft/world/level/biome/PlainsBiome.h"
 
 PlainsBiome::PlainsBiome(int id) : Biome(id) {
     friendlies.push_back(new MobSpawnerData(eTYPE_HORSE, 5, 2, 6));
diff --git a/targets/minecraft/world/level/biome/RainforestBiome.cpp b/targets/minecraft/world/level/biome/RainforestBiome.cpp
index db07e9cee..bb26b4b8e 100644
--- a/targets/minecraft/world/level/biome/RainforestBiome.cpp
+++ b/targets/minecraft/world/level/biome/RainforestBiome.cpp
@@ -1,4 +1,5 @@
 #include "RainforestBiome.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/levelgen/feature/BasicTreeFeature.h"
 #include "minecraft/world/level/levelgen/feature/TreeFeature.h"
diff --git a/targets/minecraft/world/level/biome/SwampBiome.cpp b/targets/minecraft/world/level/biome/SwampBiome.cpp
index ec38a4e42..cb6e495c5 100644
--- a/targets/minecraft/world/level/biome/SwampBiome.cpp
+++ b/targets/minecraft/world/level/biome/SwampBiome.cpp
@@ -1,10 +1,11 @@
+#include "minecraft/world/level/biome/SwampBiome.h"
+
 #include <vector>
 
-#include "minecraft/world/level/levelgen/feature/SwampTreeFeature.h"
 #include "java/Class.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/biome/BiomeDecorator.h"
-#include "minecraft/world/level/biome/SwampBiome.h"
+#include "minecraft/world/level/levelgen/feature/SwampTreeFeature.h"
 
 SwampBiome::SwampBiome(int id) : Biome(id) {
     decorator->treeCount = 2;
diff --git a/targets/minecraft/world/level/biome/TaigaBiome.cpp b/targets/minecraft/world/level/biome/TaigaBiome.cpp
index 91bcc69f0..fb95a3186 100644
--- a/targets/minecraft/world/level/biome/TaigaBiome.cpp
+++ b/targets/minecraft/world/level/biome/TaigaBiome.cpp
@@ -1,6 +1,7 @@
+#include "TaigaBiome.h"
+
 #include <vector>
 
-#include "TaigaBiome.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/level/biome/BiomeDecorator.h"
diff --git a/targets/minecraft/world/level/biome/TheEndBiome.cpp b/targets/minecraft/world/level/biome/TheEndBiome.cpp
index 11d097b34..6c2253f19 100644
--- a/targets/minecraft/world/level/biome/TheEndBiome.cpp
+++ b/targets/minecraft/world/level/biome/TheEndBiome.cpp
@@ -1,7 +1,9 @@
+#include "TheEndBiome.h"
+
 #include <stdint.h>
+
 #include <vector>
 
-#include "TheEndBiome.h"
 #include "TheEndBiomeDecorator.h"
 #include "java/Class.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp
index 18c2c46e1..c51bd2220 100644
--- a/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp
+++ b/targets/minecraft/world/level/biome/TheEndBiomeDecorator.cpp
@@ -1,8 +1,9 @@
 #include "TheEndBiomeDecorator.h"
+
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
 
 // Spike centre positions, calculated using
 // for(int i=0;i<8;i++)
diff --git a/targets/minecraft/world/level/biome/WaterlilyFeature.cpp b/targets/minecraft/world/level/biome/WaterlilyFeature.cpp
index de40d4720..3b7a7c46e 100644
--- a/targets/minecraft/world/level/biome/WaterlilyFeature.cpp
+++ b/targets/minecraft/world/level/biome/WaterlilyFeature.cpp
@@ -1,4 +1,5 @@
 #include "WaterlilyFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h b/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h
index 58151eb9b..87682b0d1 100644
--- a/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h
+++ b/targets/minecraft/world/level/biome/net.minecraft.world.level.biome.h
@@ -1,19 +1,19 @@
 #pragma once
 
 #include "Biome.h"
+#include "BiomeSource.h"
+#include "FixedBiomeSource.h"
 #include "ForestBiome.h"
 #include "HellBiome.h"
-#include "RainforestBiome.h"
 #include "IceBiome.h"
 #include "MushroomIslandBiome.h"
+#include "RainforestBiome.h"
+#include "SwampBiome.h"
+#include "TaigaBiome.h"
 #include "TheEndBiome.h"
 #include "TheEndBiomeDecorator.h"
 #include "WaterlilyFeature.h"
-#include "SwampBiome.h"
-#include "TaigaBiome.h"
 #include "minecraft/world/level/LevelSource.h"
-#include "BiomeSource.h"
-#include "FixedBiomeSource.h"
 
 // 1.8.2
 #include "BiomeCache.h"
diff --git a/targets/minecraft/world/level/chunk/BlockReplacements.cpp b/targets/minecraft/world/level/chunk/BlockReplacements.cpp
index a292589e1..332275d5b 100644
--- a/targets/minecraft/world/level/chunk/BlockReplacements.cpp
+++ b/targets/minecraft/world/level/chunk/BlockReplacements.cpp
@@ -1,6 +1,7 @@
+#include "BlockReplacements.h"
+
 #include <vector>
 
-#include "BlockReplacements.h"
 #include "minecraft/world/level/tile/Tile.h"
 
 std::vector<uint8_t> BlockReplacements::replacements =
diff --git a/targets/minecraft/world/level/chunk/BlockReplacements.h b/targets/minecraft/world/level/chunk/BlockReplacements.h
index 73a9ce4f3..1b8452b30 100644
--- a/targets/minecraft/world/level/chunk/BlockReplacements.h
+++ b/targets/minecraft/world/level/chunk/BlockReplacements.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
+#include <vector>
 
 class BlockReplacements {
 public:
diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
index 5d09cf1ac..f9108e9f5 100644
--- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
+++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
@@ -1,17 +1,19 @@
+#include "CompressedTileStorage.h"
+
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
+
 #include <vector>
 
-#include "CompressedTileStorage.h"
-#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/Definitions.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.h b/targets/minecraft/world/level/chunk/CompressedTileStorage.h
index 9444c0260..25d3c9a8f 100644
--- a/targets/minecraft/world/level/chunk/CompressedTileStorage.h
+++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.h
@@ -1,7 +1,9 @@
 #pragma once
-#include <stdint.h>
-#include <mutex>
+
+#include <cstdint>
 #include <format>
+#include <mutex>
+#include <vector>
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/targets/minecraft/world/level/chunk/DataLayer.h b/targets/minecraft/world/level/chunk/DataLayer.h
index 1ae6659e0..255346513 100644
--- a/targets/minecraft/world/level/chunk/DataLayer.h
+++ b/targets/minecraft/world/level/chunk/DataLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp
index dd67b42b5..9da1c30e7 100644
--- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp
+++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.cpp
@@ -1,5 +1,6 @@
-#include "java/Arrays.h"
 #include "EmptyLevelChunk.h"
+
+#include "java/Arrays.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
diff --git a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h
index 61a813717..0298bce67 100644
--- a/targets/minecraft/world/level/chunk/EmptyLevelChunk.h
+++ b/targets/minecraft/world/level/chunk/EmptyLevelChunk.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <typeinfo>
diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp
index e9df25aea..52d47e4e3 100644
--- a/targets/minecraft/world/level/chunk/LevelChunk.cpp
+++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp
@@ -1,30 +1,33 @@
+#include "LevelChunk.h"
+
 #include <string.h>
+
+#include <algorithm>
 #include <limits>
 #include <mutex>
-#include <algorithm>
 #include <string>
 #include <utility>
 
-#include "java/System.h"
-#include "SparseLightStorage.h"
-#include "LevelChunk.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/server/level/ServerChunkCache.h"
-#include "minecraft/client/renderer/GameRenderer.h"
-#include "minecraft/world/entity/item/ItemEntity.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "SparseLightStorage.h"
 #include "java/Class.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
+#include "java/System.h"
+#include "minecraft/client/renderer/GameRenderer.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerChunkCache.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/entity/EntitySelector.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/Mob.h"
+#include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/item/Minecart.h"
 #include "minecraft/world/entity/monster/Monster.h"
 #include "minecraft/world/entity/monster/Zombie.h"
@@ -43,9 +46,8 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/targets/minecraft/world/level/chunk/LevelChunk.h b/targets/minecraft/world/level/chunk/LevelChunk.h
index 594061af9..bbf7bf0b9 100644
--- a/targets/minecraft/world/level/chunk/LevelChunk.h
+++ b/targets/minecraft/world/level/chunk/LevelChunk.h
@@ -1,17 +1,17 @@
 #pragma once
 
 #include <stdint.h>
-#include <mutex>
+
 #include <format>
 #include <memory>
+#include <mutex>
 #include <typeinfo>
 #include <unordered_map>
 #include <vector>
 
-#include "SparseLightStorage.h"
 #include "CompressedTileStorage.h"
 #include "SparseDataStorage.h"
-#include "minecraft/world/level/LightLayer.h"
+#include "SparseLightStorage.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LightLayer.h"
diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp
index 996e5b9dd..2802cda1d 100644
--- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp
+++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp
@@ -1,4 +1,5 @@
 #include "ReadOnlyChunkCache.h"
+
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/EmptyLevelChunk.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h
index 91de2820f..6ef1ba569 100644
--- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h
+++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h
@@ -1,14 +1,15 @@
 #pragma once
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "ChunkSource.h"
-#include "LevelChunk.h"
 #include "EmptyLevelChunk.h"
-#include "minecraft/world/level/chunk/storage/ChunkStorage.h"
+#include "LevelChunk.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/storage/ChunkStorage.h"
 
 class ProgressListener;
 class ChunkStorage;
diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
index d3b13171b..4b028125c 100644
--- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
@@ -1,15 +1,17 @@
+#include "SparseDataStorage.h"
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <vector>
 
-#include "SparseDataStorage.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.h b/targets/minecraft/world/level/chunk/SparseDataStorage.h
index 762dc384b..a407dbb83 100644
--- a/targets/minecraft/world/level/chunk/SparseDataStorage.h
+++ b/targets/minecraft/world/level/chunk/SparseDataStorage.h
@@ -1,6 +1,7 @@
 #pragma once
-#include <stdint.h>
+#include <cstdint>
 #include <format>
+#include <vector>
 
 // 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/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
index ce8fd0343..313e0d82a 100644
--- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
@@ -1,15 +1,17 @@
+#include "SparseLightStorage.h"
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <vector>
 
-#include "SparseLightStorage.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.h b/targets/minecraft/world/level/chunk/SparseLightStorage.h
index 01a56038b..8e92be4a1 100644
--- a/targets/minecraft/world/level/chunk/SparseLightStorage.h
+++ b/targets/minecraft/world/level/chunk/SparseLightStorage.h
@@ -1,6 +1,8 @@
 #pragma once
-#include <stdint.h>
+
+#include <cstdint>
 #include <format>
+#include <vector>
 
 // 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/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp
index 68df20824..95a88515c 100644
--- a/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp
+++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.cpp
@@ -1,4 +1,5 @@
 #include "WaterLevelChunk.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
diff --git a/targets/minecraft/world/level/chunk/WaterLevelChunk.h b/targets/minecraft/world/level/chunk/WaterLevelChunk.h
index e72dbbf1b..5dce4df6a 100644
--- a/targets/minecraft/world/level/chunk/WaterLevelChunk.h
+++ b/targets/minecraft/world/level/chunk/WaterLevelChunk.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <typeinfo>
diff --git a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp
index bfd4bcf73..75fe3e8e4 100644
--- a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp
+++ b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp
@@ -1,8 +1,9 @@
+#include "ChunkStorageProfileDecorator.h"
+
 #include <stdio.h>
 
-#include "java/System.h"
-#include "ChunkStorageProfileDecorator.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/System.h"
 #include "minecraft/world/level/chunk/storage/ChunkStorage.h"
 
 ChunkStorageProfilerDecorator::ChunkStorageProfilerDecorator(
diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
index 3aa2d3666..7f8e21533 100644
--- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
@@ -1,36 +1,38 @@
+#include "McRegionChunkStorage.h"
+
 #include <stdio.h>
 #include <string.h>
+
+#include <chrono>
 #include <mutex>
 #include <thread>
-#include <chrono>
 #include <utility>
 
-#include "console_helpers/ThreadName.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "McRegionChunkStorage.h"
-#include "console_helpers/C4JThread.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/C4JThread.h"
+#include "console_helpers/ThreadName.h"
 #include "console_helpers/compression.h"
 #include "java/InputOutputStream/BufferedOutputStream.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/NbtIo.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "minecraft/world/level/chunk/storage/RegionFileCache.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "minecraft/world/level/storage/LevelData.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/NbtIo.h"
 #include "platform/PlatformServices.h"
 
 class DataInput;
diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h
index f50c667c5..403ddb8bf 100644
--- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h
+++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h
@@ -1,18 +1,19 @@
 #pragma once
 
 #include <stdint.h>
-#include <mutex>
+
 #include <deque>
 #include <format>
+#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "ChunkStorage.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "RegionFileCache.h"
-#include "nbt/com.mojang.nbt.h"
 #include "OldChunkStorage.h"
+#include "RegionFileCache.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "nbt/com.mojang.nbt.h"
 
 class ConsoleSaveFile;
 class C4JThread;
diff --git a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
index 6fb6cc77a..7e31908f3 100644
--- a/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/MemoryChunkStorage.cpp
@@ -1,7 +1,8 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "MemoryChunkStorage.h"
 
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+
 LevelChunk* MemoryChunkStorage::load(Level* level, int x,
                                      int z)  // throws IOException
 {
diff --git a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp
index 2bb9fa32d..7f93364c2 100644
--- a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp
+++ b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp
@@ -1,6 +1,7 @@
-#include "java/File.h"
 #include "NbtSlotFile.h"
 
+#include "java/File.h"
+
 namespace {
 std::FILE* OpenBinaryFileForReadWrite(const File& file) {
 #if defined(_WIN32)
diff --git a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h
index d0c6355b1..700b96c42 100644
--- a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h
+++ b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <cstdio>
 
-#include "nbt/CompoundTag.h"
 #include "ZonedChunkStorage.h"
+#include "nbt/CompoundTag.h"
 #include "nbt/com.mojang.nbt.h"
 
 class NbtSlotFile {
diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
index 01c53f4ab..e82ffa5ae 100644
--- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
@@ -1,36 +1,38 @@
+#include "OldChunkStorage.h"
+
 #include <assert.h>
 #include <stdio.h>
-#include <mutex>
+
 #include <format>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include "java/File.h"
-#include "OldChunkStorage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/Definitions.h"
+#include "java/File.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/InputOutputStream/FileInputStream.h"
 #include "java/InputOutputStream/FileOutputStream.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/NbtIo.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/EntityIO.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/TickNextTickData.h"
 #include "minecraft/world/level/TilePos.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/NbtIo.h"
 #include "platform/PlatformServices.h"
 
 thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage =
diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h
index 2e77d8f8a..1bdf7ec9d 100644
--- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h
+++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h
@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "ChunkStorage.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
 #include "java/File.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/com.mojang.nbt.h"
 
diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp
index 8b8243e90..fcd3b688f 100644
--- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp
+++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp
@@ -1,21 +1,23 @@
+#include "RegionFile.h"
+
 #include <string.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <string>
 
-#include "java/System.h"
-#include "java/File.h"
-#include "RegionFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "console_helpers/compression.h"
+#include "java/File.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "java/System.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 std::vector<uint8_t> RegionFile::emptySector(SECTOR_BYTES);
 
diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.h b/targets/minecraft/world/level/chunk/storage/RegionFile.h
index f69cdfe09..049431186 100644
--- a/targets/minecraft/world/level/chunk/storage/RegionFile.h
+++ b/targets/minecraft/world/level/chunk/storage/RegionFile.h
@@ -1,11 +1,12 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
 #include "console_helpers/compression.h"
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/InputOutputStream.h"
 
 class FileEntry;
 class ConsoleSaveFile;
diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp
index 420a2228b..332127c30 100644
--- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp
+++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp
@@ -1,10 +1,11 @@
+#include "RegionFileCache.h"
+
 #include <utility>
 
-#include "java/File.h"
-#include "RegionFileCache.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "console_helpers/StringHelpers.h"
+#include "java/File.h"
 #include "minecraft/world/level/chunk/storage/RegionFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h
index 249b8b950..05d407906 100644
--- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h
+++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h
@@ -3,8 +3,8 @@
 #include <unordered_map>
 
 #include "RegionFile.h"
-#include "java/Reference.h"
 #include "java/File.h"
+#include "java/Reference.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class ConsoleSaveFile;
diff --git a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp
index 85053fb99..06f70c1b1 100644
--- a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp
+++ b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp
@@ -1,6 +1,7 @@
+#include "ZoneFile.h"
+
 #include "java/ByteBuffer.h"
 #include "java/File.h"
-#include "ZoneFile.h"
 
 namespace {
 std::FILE* OpenBinaryFileForReadWrite(const File& file) {
diff --git a/targets/minecraft/world/level/chunk/storage/ZoneFile.h b/targets/minecraft/world/level/chunk/storage/ZoneFile.h
index 784aedee0..0ccc64444 100644
--- a/targets/minecraft/world/level/chunk/storage/ZoneFile.h
+++ b/targets/minecraft/world/level/chunk/storage/ZoneFile.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <cstdio>
 
-#include "ZonedChunkStorage.h"
 #include "NbtSlotFile.h"
 #include "ZoneIo.h"
+#include "ZonedChunkStorage.h"
 
 class ZoneFile {
 public:
diff --git a/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp b/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp
index 8f58703e1..659c17245 100644
--- a/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp
+++ b/targets/minecraft/world/level/chunk/storage/ZoneIo.cpp
@@ -1,6 +1,7 @@
-#include "java/ByteBuffer.h"
 #include "ZoneIo.h"
 
+#include "java/ByteBuffer.h"
+
 namespace {
 bool SeekFile(std::FILE* file, int64_t offset) {
 #if defined(_WIN32)
diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
index dc9122beb..e7c1f4d3a 100644
--- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
+++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp
@@ -1,12 +1,14 @@
+#include "ZonedChunkStorage.h"
+
 #include <mutex>
-#include "java/File.h"
+
+#include "ZoneFile.h"
 #include "java/ByteBuffer.h"
+#include "java/File.h"
 #include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
-#include "ZonedChunkStorage.h"
-#include "ZoneFile.h"
 
 // 4J Stu - There are changes to this class for 1.8.2, but since we never use it
 // anyway lets not worry about it
diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h
index 82d51a98a..c068bc648 100644
--- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h
+++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "java/File.h"
 #include "ChunkStorage.h"
+#include "java/File.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 
 // 4J Stu - There are changes to this class for 1.8.2, but since we never use it
diff --git a/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h b/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h
index 114264ecc..900803f6e 100644
--- a/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h
+++ b/targets/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h
@@ -2,12 +2,12 @@
 
 #include "ChunkStorage.h"
 #include "ChunkStorageProfileDecorator.h"
-#include "MemoryChunkStorage.h"
 #include "McRegionChunkStorage.h"
+#include "MemoryChunkStorage.h"
 #include "NbtSlotFile.h"
 #include "OldChunkStorage.h"
 #include "RegionFile.h"
 #include "RegionFileCache.h"
-#include "ZonedChunkStorage.h"
 #include "ZoneFile.h"
-#include "ZoneIo.h"
\ No newline at end of file
+#include "ZoneIo.h"
+#include "ZonedChunkStorage.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp
index 8bb26687a..f0b7e737c 100644
--- a/targets/minecraft/world/level/dimension/Dimension.cpp
+++ b/targets/minecraft/world/level/dimension/Dimension.cpp
@@ -1,21 +1,23 @@
+#include "Dimension.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "Dimension.h"
-#include "minecraft/world/level/biome/BiomeSource.h"
-#include "minecraft/world/level/biome/FixedBiomeSource.h"
-#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "HellDimension.h"
+#include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
+#include "Minecraft.Client/Linux/Linux_App.h"
 #include "NormalDimension.h"
 #include "TheEndDimension.h"
 #include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "Minecraft.Client/Common/App_enums.h"
-#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
+#include "minecraft/world/level/biome/FixedBiomeSource.h"
+#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "minecraft/world/level/levelgen/CustomLevelSource.h"
 #include "minecraft/world/level/levelgen/FlatLevelSource.h"
 #include "minecraft/world/level/levelgen/RandomLevelSource.h"
diff --git a/targets/minecraft/world/level/dimension/Dimension.h b/targets/minecraft/world/level/dimension/Dimension.h
index 249d1801f..f64863169 100644
--- a/targets/minecraft/world/level/dimension/Dimension.h
+++ b/targets/minecraft/world/level/dimension/Dimension.h
@@ -1,11 +1,11 @@
 #pragma once
 #include <stdint.h>
+
 #include <string>
 
-#include "minecraft/world/level/material/Material.h"
-#include "minecraft/world/phys/Vec3.h"
-#include "minecraft/Pos.h"
 #include "java/File.h"
+#include "minecraft/Pos.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/phys/Vec3.h"
 
 class BiomeSource;
diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp
index 26308bd99..818bd2c04 100644
--- a/targets/minecraft/world/level/dimension/HellDimension.cpp
+++ b/targets/minecraft/world/level/dimension/HellDimension.cpp
@@ -1,11 +1,12 @@
+#include "HellDimension.h"
+
 #include <cmath>
 
-#include "HellDimension.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/biome/Biome.h"
diff --git a/targets/minecraft/world/level/dimension/TheEndDimension.cpp b/targets/minecraft/world/level/dimension/TheEndDimension.cpp
index 5924fc48a..9570ee930 100644
--- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp
+++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp
@@ -1,14 +1,16 @@
+#include "TheEndDimension.h"
+
 #include <math.h>
+
 #include <numbers>
 
-#include "TheEndDimension.h"
-#include "minecraft/world/level/biome/FixedBiomeSource.h"
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "minecraft/Pos.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/biome/FixedBiomeSource.h"
 #include "minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp
index 6d2de6f99..1c6407db4 100644
--- a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp
@@ -1,7 +1,8 @@
+#include "CanyonFeature.h"
+
 #include <numbers>
 #include <vector>
 
-#include "CanyonFeature.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.h b/targets/minecraft/world/level/levelgen/CanyonFeature.h
index 136fb30dc..af77a87ad 100644
--- a/targets/minecraft/world/level/levelgen/CanyonFeature.h
+++ b/targets/minecraft/world/level/levelgen/CanyonFeature.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 
 #include "LargeFeature.h"
diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
index e3fe50069..4c3ba27e1 100644
--- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
@@ -1,14 +1,19 @@
+#include "CustomLevelSource.h"
+
 #include <assert.h>
 #include <string.h>
-#include <fstream>
-#include <filesystem>
 
-#include "CustomLevelSource.h"
+#include <filesystem>
+#include <fstream>
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #if defined(__linux__)
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #endif
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/MobCategory.h"
 #include "minecraft/world/level/Level.h"
@@ -27,9 +32,6 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 const double CustomLevelSource::SNOW_SCALE = 0.3;
 const double CustomLevelSource::SNOW_CUTOFF = 0.5;
diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.h b/targets/minecraft/world/level/levelgen/CustomLevelSource.h
index eb7a364a2..019ae32d3 100644
--- a/targets/minecraft/world/level/levelgen/CustomLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 
diff --git a/targets/minecraft/world/level/levelgen/DungeonFeature.cpp b/targets/minecraft/world/level/levelgen/DungeonFeature.cpp
index f9b4fca20..7a9891f5d 100644
--- a/targets/minecraft/world/level/levelgen/DungeonFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/DungeonFeature.cpp
@@ -1,7 +1,8 @@
+#include "DungeonFeature.h"
+
 #include <numbers>
 #include <vector>
 
-#include "DungeonFeature.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/DungeonFeature.h b/targets/minecraft/world/level/levelgen/DungeonFeature.h
index 98eb4bdc5..9d51f94ab 100644
--- a/targets/minecraft/world/level/levelgen/DungeonFeature.h
+++ b/targets/minecraft/world/level/levelgen/DungeonFeature.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 
 #include "LargeFeature.h"
diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp
index 43c112ffb..c5bd65d00 100644
--- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp
@@ -1,17 +1,18 @@
+#include "FlatLevelSource.h"
+
 #include <vector>
 
-#include "FlatLevelSource.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
 #include "minecraft/world/level/levelgen/structure/VillageFeature.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 // FlatLevelSource::villageFeature = new VillageFeature(1);
 
diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.h b/targets/minecraft/world/level/levelgen/FlatLevelSource.h
index 3bf0afe34..15dabd66b 100644
--- a/targets/minecraft/world/level/levelgen/FlatLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <string>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 
diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
index aac138640..67b58dd5c 100644
--- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
@@ -1,9 +1,13 @@
+#include "HellFlatLevelSource.h"
+
 #include <cmath>
 #include <vector>
 
-#include "HellFlatLevelSource.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/chunk/LevelChunk.h"
@@ -12,9 +16,6 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) {
     int xzSize = level->getLevelData()->getXZSize();
diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h
index 1781ad9db..a8b43a9d0 100644
--- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h
@@ -1,20 +1,20 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <string>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
-#include "minecraft/world/level/levelgen/synth/PerlinNoise.h"
 #include "LargeFeature.h"
 #include "LargeHellCaveFeature.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/world/level/levelgen/feature/HellFireFeature.h"
-#include "minecraft/world/level/levelgen/feature/LightGemFeature.h"
-#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h"
-#include "minecraft/world/level/levelgen/feature/FlowerFeature.h"
-#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/levelgen/feature/FlowerFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellFireFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h"
+#include "minecraft/world/level/levelgen/feature/LightGemFeature.h"
+#include "minecraft/world/level/levelgen/synth/PerlinNoise.h"
 
 class ProgressListener;
 class Level;
diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
index a2b180d04..251e392f5 100644
--- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
@@ -1,10 +1,14 @@
+#include "HellRandomLevelSource.h"
+
 #include <algorithm>
 #include <cmath>
 #include <numbers>
 
-#include "HellRandomLevelSource.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/MobCategory.h"
 #include "minecraft/world/level/Level.h"
@@ -22,9 +26,6 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) {
     int xzSize = level->getLevelData()->getXZSize();
diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h
index 100a330e9..067205ba5 100644
--- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h
@@ -1,22 +1,22 @@
 #pragma once
 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
-#include "minecraft/world/level/levelgen/synth/PerlinNoise.h"
 #include "LargeFeature.h"
 #include "LargeHellCaveFeature.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/world/level/levelgen/feature/HellFireFeature.h"
-#include "minecraft/world/level/levelgen/feature/LightGemFeature.h"
-#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h"
-#include "minecraft/world/level/levelgen/feature/FlowerFeature.h"
-#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h"
-#include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/levelgen/feature/FlowerFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellFireFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellPortalFeature.h"
+#include "minecraft/world/level/levelgen/feature/HellSpringFeature.h"
+#include "minecraft/world/level/levelgen/feature/LightGemFeature.h"
+#include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h"
+#include "minecraft/world/level/levelgen/synth/PerlinNoise.h"
 
 class ProgressListener;
 class LargeFeature;
diff --git a/targets/minecraft/world/level/levelgen/LargeCaveFeature.cpp b/targets/minecraft/world/level/levelgen/LargeCaveFeature.cpp
index cd9115254..ecfc4fa74 100644
--- a/targets/minecraft/world/level/levelgen/LargeCaveFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/LargeCaveFeature.cpp
@@ -1,7 +1,8 @@
+#include "LargeCaveFeature.h"
+
 #include <numbers>
 #include <vector>
 
-#include "LargeCaveFeature.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/LargeCaveFeature.h b/targets/minecraft/world/level/levelgen/LargeCaveFeature.h
index e7450ff4f..60a61ebaa 100644
--- a/targets/minecraft/world/level/levelgen/LargeCaveFeature.h
+++ b/targets/minecraft/world/level/levelgen/LargeCaveFeature.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 
 #include "LargeFeature.h"
diff --git a/targets/minecraft/world/level/levelgen/LargeFeature.cpp b/targets/minecraft/world/level/levelgen/LargeFeature.cpp
index 35b025526..52423f3a9 100644
--- a/targets/minecraft/world/level/levelgen/LargeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/LargeFeature.cpp
@@ -1,9 +1,11 @@
 
+#include "LargeFeature.h"
+
 #include <stdint.h>
+
 #include <format>
 #include <string>
 
-#include "LargeFeature.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/LargeFeature.h"
diff --git a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp
index 104c3c486..35d9d4dcf 100644
--- a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.cpp
@@ -1,7 +1,8 @@
+#include "LargeHellCaveFeature.h"
+
 #include <numbers>
 #include <vector>
 
-#include "LargeHellCaveFeature.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h
index 5f6d07cb9..c5d7d467d 100644
--- a/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h
+++ b/targets/minecraft/world/level/levelgen/LargeHellCaveFeature.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 
 #include "LargeFeature.h"
diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
index 4c3815630..01083c547 100644
--- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
@@ -1,7 +1,11 @@
 #include "RandomLevelSource.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "console_helpers/PlatformTime.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
@@ -24,9 +28,6 @@
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 const double RandomLevelSource::SNOW_SCALE = 0.3;
 const double RandomLevelSource::SNOW_CUTOFF = 0.5;
diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.h b/targets/minecraft/world/level/levelgen/RandomLevelSource.h
index 14e1c0430..023c361d6 100644
--- a/targets/minecraft/world/level/levelgen/RandomLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 
diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
index da6a860dc..a763515bd 100644
--- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
@@ -1,8 +1,12 @@
+#include "TheEndLevelRandomLevelSource.h"
+
 #include <cmath>
 
-#include "TheEndLevelRandomLevelSource.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/BiomeSource.h"
@@ -10,9 +14,6 @@
 #include "minecraft/world/level/levelgen/synth/PerlinNoise.h"
 #include "minecraft/world/level/tile/HeavyTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level,
                                                            int64_t seed) {
diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h
index ffdcac9eb..1657216c1 100644
--- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h
+++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/chunk/ChunkSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
 
diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
index 97c514ef6..2b90e15a0 100644
--- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
@@ -1,19 +1,21 @@
+#include "BasicTreeFeature.h"
+
 #include <stdlib.h>
+
 #include <algorithm>
 #include <cmath>
 
-#include "BasicTreeFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/TreeTile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1};
 
diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
index bcb213534..eb092b3d4 100644
--- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
@@ -1,6 +1,7 @@
+#include "BirchFeature.h"
+
 #include <stdlib.h>
 
-#include "BirchFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp
index cb99c75d6..5ea5d0b8c 100644
--- a/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BonusChestFeature.cpp
@@ -1,8 +1,9 @@
+#include "BonusChestFeature.h"
+
 #include <memory>
 
-#include "BonusChestFeature.h"
-#include "minecraft/util/WeighedTreasure.h"
 #include "java/Random.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/ChestTileEntity.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/CactusFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CactusFeature.cpp
index d7798ed6f..b61c6a09e 100644
--- a/targets/minecraft/world/level/levelgen/feature/CactusFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/CactusFeature.cpp
@@ -1,4 +1,5 @@
 #include "CactusFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
index 01ef40118..17baa23b7 100644
--- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
@@ -1,8 +1,10 @@
+#include "CaveFeature.h"
+
 #include <stdint.h>
+
 #include <numbers>
 #include <vector>
 
-#include "CaveFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/ClayFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ClayFeature.cpp
index 764b1cf81..76216ea2f 100644
--- a/targets/minecraft/world/level/levelgen/feature/ClayFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/ClayFeature.cpp
@@ -1,4 +1,5 @@
 #include "ClayFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp b/targets/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp
index 9d53e9f0e..d434afab6 100644
--- a/targets/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/DeadBushFeature.cpp
@@ -1,4 +1,5 @@
 #include "DeadBushFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp b/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp
index c8cc26a8e..97991e3e4 100644
--- a/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/DesertWellFeature.cpp
@@ -1,4 +1,5 @@
 #include "DesertWellFeature.h"
+
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/StoneSlabTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp
index 9df45b88c..d5200e83e 100644
--- a/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/EndPodiumFeature.cpp
@@ -1,9 +1,10 @@
+#include "EndPodiumFeature.h"
+
 #include <cmath>
 
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "EndPodiumFeature.h"
 
 EndPodiumFeature::EndPodiumFeature(int tile) {
     this->tile = tile;
diff --git a/targets/minecraft/world/level/levelgen/feature/Feature.cpp b/targets/minecraft/world/level/levelgen/feature/Feature.cpp
index fc347eacb..7d1ccff5b 100644
--- a/targets/minecraft/world/level/levelgen/feature/Feature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/Feature.cpp
@@ -1,4 +1,5 @@
 #include "Feature.h"
+
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
index 034ec4850..2159ba560 100644
--- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
@@ -1,4 +1,5 @@
 #include "FlowerFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
index e5946715a..8fa53dcbd 100644
--- a/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
@@ -1,12 +1,13 @@
+#include "GroundBushFeature.h"
+
 #include <stdlib.h>
 
-#include "GroundBushFeature.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 GroundBushFeature::GroundBushFeature(int trunkType, int leafType) {
     trunkTileType = trunkType;
diff --git a/targets/minecraft/world/level/levelgen/feature/HellFireFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HellFireFeature.cpp
index 897376ee7..2f7bb32fe 100644
--- a/targets/minecraft/world/level/levelgen/feature/HellFireFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/HellFireFeature.cpp
@@ -1,4 +1,5 @@
 #include "HellFireFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp
index 407bdf3c9..53a8c48ec 100644
--- a/targets/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/HellPortalFeature.cpp
@@ -1,4 +1,5 @@
 #include "HellPortalFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp
index 92820816f..8a9d6ed2f 100644
--- a/targets/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/HellSpringFeature.cpp
@@ -1,4 +1,5 @@
 #include "HellSpringFeature.h"
+
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/levelgen/feature/HouseFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HouseFeature.cpp
index f31647411..ad216b2e9 100644
--- a/targets/minecraft/world/level/levelgen/feature/HouseFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/HouseFeature.cpp
@@ -1,6 +1,7 @@
+#include "HouseFeature.h"
+
 #include <memory>
 
-#include "HouseFeature.h"
 #include "java/Random.h"
 #include "minecraft/world/entity/monster/PigZombie.h"
 #include "minecraft/world/item/DoorItem.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp b/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp
index eda6fe8ab..0873c4d48 100644
--- a/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/HugeMushroomFeature.cpp
@@ -1,4 +1,5 @@
 #include "HugeMushroomFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
index 1de1c377c..4bebfd027 100644
--- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
@@ -1,4 +1,5 @@
 #include "LakeFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/LightGemFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LightGemFeature.cpp
index 5a7b380f6..b9c88cc12 100644
--- a/targets/minecraft/world/level/levelgen/feature/LightGemFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/LightGemFeature.cpp
@@ -1,4 +1,5 @@
 #include "LightGemFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
index 6f7c23621..5d5572876 100644
--- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
@@ -1,17 +1,18 @@
+#include "MegaTreeFeature.h"
+
 #include <numbers>
 
-#include "MegaTreeFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/VineTile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType,
                                  int leafType)
diff --git a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp
index 5adac555b..ffe7c1b58 100644
--- a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp
@@ -1,9 +1,10 @@
+#include "MonsterRoomFeature.h"
+
 #include <memory>
 #include <vector>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "MonsterRoomFeature.h"
 #include "java/Random.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.h b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.h
index 65b709257..afe133103 100644
--- a/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.h
+++ b/targets/minecraft/world/level/levelgen/feature/NetherSphereFeature.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "minecraft/world/entity/Entity.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/Entity.h"
 
diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
index fad0f73d9..b9d45e304 100644
--- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
@@ -1,15 +1,16 @@
+#include "OreFeature.h"
+
 #include <numbers>
 
-#include "OreFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 void OreFeature::_init(int tile, int count, int targetTile) {
     this->tile = tile;
diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
index 28c8ad13b..2410e5e18 100644
--- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
@@ -1,6 +1,7 @@
+#include "PineFeature.h"
+
 #include <stdlib.h>
 
-#include "PineFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp
index 221791a12..21dd9ba65 100644
--- a/targets/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/PumpkinFeature.cpp
@@ -1,4 +1,5 @@
 #include "PumpkinFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
index 65581e22a..15fd09842 100644
--- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
@@ -1,4 +1,5 @@
 #include "ReedsFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
index b2eb9c3a1..03dacd96f 100644
--- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
@@ -1,4 +1,5 @@
 #include "SandFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp
index 3b082cf40..2ecb27853 100644
--- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp
@@ -1,8 +1,9 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "SpikeFeature.h"
 
+#include "minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+
 SpikeFeature::SpikeFeature(int tile) {
     this->tile = tile;
     // m_iIndex=0;
diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
index 64d1faa97..a39340d96 100644
--- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
@@ -1,4 +1,5 @@
 #include "SpringFeature.h"
+
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
index 42beea5d2..060182393 100644
--- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
@@ -1,6 +1,7 @@
+#include "SpruceFeature.h"
+
 #include <stdlib.h>
 
-#include "SpruceFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
index bae680e4a..ceaee11ff 100644
--- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
@@ -1,6 +1,7 @@
+#include "SwampTreeFeature.h"
+
 #include <stdlib.h>
 
-#include "SwampTreeFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp
index 5599abe74..1400f0572 100644
--- a/targets/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/TallGrassFeature.cpp
@@ -1,4 +1,5 @@
 #include "TallGrassFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
index 322b42635..a32b79d89 100644
--- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
@@ -1,17 +1,18 @@
+#include "TreeFeature.h"
+
 #include <stdlib.h>
 
-#include "TreeFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/VineTile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 TreeFeature::TreeFeature(bool doUpdate)
     : Feature(doUpdate),
diff --git a/targets/minecraft/world/level/levelgen/feature/VinesFeature.cpp b/targets/minecraft/world/level/levelgen/feature/VinesFeature.cpp
index 532f5dfdd..838233288 100644
--- a/targets/minecraft/world/level/levelgen/feature/VinesFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/VinesFeature.cpp
@@ -1,4 +1,5 @@
 #include "VinesFeature.h"
+
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h b/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h
index 46dea209b..f45b4dc65 100644
--- a/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h
+++ b/targets/minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h
@@ -2,36 +2,34 @@
 
 #include "BasicTreeFeature.h"
 #include "BirchFeature.h"
+#include "BonusChestFeature.h"
 #include "CactusFeature.h"
 #include "CaveFeature.h"
 #include "ClayFeature.h"
 #include "DeadBushFeature.h"
+#include "DesertWellFeature.h"
+#include "EndPodiumFeature.h"
 #include "Feature.h"
 #include "FlowerFeature.h"
+#include "GroundBushFeature.h"
 #include "HellFireFeature.h"
 #include "HellPortalFeature.h"
 #include "HellSpringFeature.h"
 #include "HouseFeature.h"
+#include "HugeMushroomFeature.h"
 #include "LakeFeature.h"
 #include "LightGemFeature.h"
+#include "MegaTreeFeature.h"
 #include "MonsterRoomFeature.h"
 #include "OreFeature.h"
 #include "PineFeature.h"
 #include "PumpkinFeature.h"
 #include "ReedsFeature.h"
+#include "SandFeature.h"
+#include "SpikeFeature.h"
 #include "SpringFeature.h"
 #include "SpruceFeature.h"
+#include "SwampTreeFeature.h"
 #include "TallGrassFeature.h"
 #include "TreeFeature.h"
-
-#include "HugeMushroomFeature.h"
-#include "SandFeature.h"
-#include "SwampTreeFeature.h"
-#include "BonusChestFeature.h"
-#include "SpikeFeature.h"
-#include "EndPodiumFeature.h"
-
-#include "DesertWellFeature.h"
-#include "MegaTreeFeature.h"
-#include "VinesFeature.h"
-#include "GroundBushFeature.h"
\ No newline at end of file
+#include "VinesFeature.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
index e0d8ef242..818b69caa 100644
--- a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
+++ b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
@@ -1,4 +1,5 @@
 #include "FlatGeneratorInfo.h"
+
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/levelgen/flat/FlatLayerInfo.h"
diff --git a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
index a5cb28666..dc4a9ff95 100644
--- a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
+++ b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
@@ -1,4 +1,5 @@
 #include "FlatLayerInfo.h"
+
 #include "console_helpers/StringHelpers.h"
 
 void FlatLayerInfo::_init(int height, int id) {
diff --git a/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h b/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h
index ea17a33c2..95eda9450 100644
--- a/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h
+++ b/targets/minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h
@@ -1,15 +1,14 @@
 #pragma once
 
 #include "CanyonFeature.h"
+#include "CustomLevelSource.h"
 #include "DungeonFeature.h"
-#include "HellRandomLevelSource.h"
+#include "FlatLevelSource.h"
 #include "HellFlatLevelSource.h"
+#include "HellRandomLevelSource.h"
 #include "LargeCaveFeature.h"
 #include "LargeFeature.h"
 #include "LargeHellCaveFeature.h"
 #include "RandomLevelSource.h"
-#include "FlatLevelSource.h"
-#include "TownFeature.h"
 #include "TheEndLevelRandomLevelSource.h"
-
-#include "CustomLevelSource.h"
\ No newline at end of file
+#include "TownFeature.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp
index f7855b410..da4403dc5 100644
--- a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.cpp
@@ -1,6 +1,7 @@
+#include "BlockGenMethods.h"
+
 #include <vector>
 
-#include "BlockGenMethods.h"
 #include "minecraft/Direction.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.h b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.h
index 87dd7cc66..2394ec0d7 100644
--- a/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.h
+++ b/targets/minecraft/world/level/levelgen/structure/BlockGenMethods.h
@@ -1,6 +1,8 @@
 #pragma once
+
 #include <cstdint>
 #include <format>
+#include <vector>
 
 class Level;
 
diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp
index 271704158..db97bf5f3 100644
--- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp
@@ -1,14 +1,16 @@
+#include "BoundingBox.h"
+
 #include <limits.h>
+
 #include <format>
 #include <string>
 #include <vector>
 
-#include "BoundingBox.h"
-#include "minecraft/Direction.h"
-#include "java/JavaMath.h"
 #include "console_helpers/StringHelpers.h"
-#include "nbt/IntArrayTag.h"
+#include "java/JavaMath.h"
+#include "minecraft/Direction.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "nbt/IntArrayTag.h"
 
 BoundingBox::BoundingBox() {
     // 4J added initialisers
diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
index ab1488823..f704b230a 100644
--- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
@@ -1,5 +1,8 @@
 
+#include "minecraft/world/level/levelgen/structure/MineShaftFeature.h"
+
 #include <stdlib.h>
+
 #include <algorithm>
 #include <string>
 #include <unordered_map>
@@ -10,7 +13,6 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
-#include "minecraft/world/level/levelgen/structure/MineShaftFeature.h"
 #include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
 
 const std::wstring MineShaftFeature::OPTION_CHANCE = L"chance";
diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp
index ad1c79fb6..2259894fb 100644
--- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp
@@ -1,16 +1,15 @@
+#include "MineShaftPieces.h"
+
 #include <stdlib.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "MineShaftPieces.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/IntArrayTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/Direction.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/entity/item/MinecartChest.h"
 #include "minecraft/world/item/CoalItem.h"
 #include "minecraft/world/item/DyePowderItem.h"
@@ -23,6 +22,9 @@
 #include "minecraft/world/level/tile/RailTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/IntArrayTag.h"
+#include "nbt/ListTag.h"
 
 std::vector<WeighedTreasure*> MineShaftPieces::smallTreasureItems;
 ;
diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp
index a5429fbeb..f3c5b2f78 100644
--- a/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/MineShaftStart.cpp
@@ -1,8 +1,9 @@
 
+#include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
+
 #include <list>
 
 #include "minecraft/world/level/levelgen/structure/MineShaftPieces.h"
-#include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
 #include "minecraft/world/level/levelgen/structure/StructureStart.h"
 
 class Level;
diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
index e59e4ea0a..bc47b6dc2 100644
--- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
@@ -1,10 +1,11 @@
+#include "NetherBridgeFeature.h"
+
 #include <list>
 #include <unordered_map>
 
-#include "NetherBridgeFeature.h"
-#include "NetherBridgePieces.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "NetherBridgePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/world/level/ChunkPos.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h
index abbfe2b13..73bfa458e 100644
--- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h
+++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h
@@ -6,7 +6,6 @@
 #include "StructureFeature.h"
 #include "StructureStart.h"
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
 
diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp
index 6bc3afed0..d0d552857 100644
--- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp
@@ -1,13 +1,14 @@
+#include "NetherBridgePieces.h"
+
 #include <stdlib.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "NetherBridgePieces.h"
-#include "minecraft/Direction.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/Direction.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/Level.h"
@@ -15,6 +16,7 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
+#include "nbt/CompoundTag.h"
 
 void NetherBridgePieces::loadStatic() {
     StructureFeatureIO::setPieceId(eStructurePiece_BridgeCrossing,
diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
index 9c7346e90..89884780a 100644
--- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
@@ -1,10 +1,11 @@
+#include "RandomScatteredLargeFeature.h"
+
 #include <list>
 #include <utility>
 
-#include "ScatteredFeaturePieces.h"
-#include "RandomScatteredLargeFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "ScatteredFeaturePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
index c6118dec7..9501ab503 100644
--- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
@@ -1,16 +1,16 @@
+#include "ScatteredFeaturePieces.h"
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "ScatteredFeaturePieces.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/entity/monster/Witch.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
@@ -29,6 +29,7 @@
 #include "minecraft/world/level/tile/TreeTile.h"
 #include "minecraft/world/level/tile/TripWireSourceTile.h"
 #include "minecraft/world/level/tile/TripWireTile.h"
+#include "nbt/CompoundTag.h"
 
 void ScatteredFeaturePieces::loadStatic() {
     StructureFeatureIO::setPieceId(eStructurePiece_DesertPyramidPiece,
diff --git a/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp b/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
index fd63809f1..5e0839b9c 100644
--- a/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/SkyIslandDimension.cpp
@@ -1,8 +1,9 @@
 #include "SkyIslandDimension.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+
 #include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/level/levelgen/net.minecraft.world.level.levelgen.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 
 void SkyIslandDimension::init() {
     biomeSource = new FixedBiomeSource(Biome::sky, 0.5f, 0);
diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
index 4d8cc0c0d..dbd2b3cc1 100644
--- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
@@ -1,17 +1,19 @@
+#include "StrongholdFeature.h"
+
 #include <assert.h>
 #include <math.h>
+
 #include <list>
 #include <numbers>
 #include <utility>
 #include <vector>
 
-#include "StrongholdFeature.h"
-#include "StrongholdPieces.h"
-#include "java/JavaMath.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "StrongholdPieces.h"
+#include "java/JavaMath.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/ChunkPos.h"
diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
index b889b03c4..ece357db0 100644
--- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
@@ -1,24 +1,25 @@
+#include "StrongholdPieces.h"
+
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <memory>
 #include <string>
 
-#include "StrongholdPieces.h"
-#include "minecraft/util/WeighedTreasure.h"
-#include "minecraft/Facing.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Direction.h"
+#include "minecraft/Facing.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/item/CoalItem.h"
 #include "minecraft/world/item/EnchantedBookItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/DoorTile.h"
 #include "minecraft/world/level/tile/SmoothStoneBrickTile.h"
@@ -27,6 +28,7 @@
 #include "minecraft/world/level/tile/TheEndPortalFrameTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
+#include "nbt/CompoundTag.h"
 
 int StrongholdPieces::totalWeight = 0;
 std::list<StrongholdPieces::PieceWeight*> StrongholdPieces::currentPieces;
diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp
index fcd9f005c..c29338ac2 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp
@@ -1,5 +1,8 @@
+#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
+
 #include <float.h>
 #include <stdint.h>
+
 #include <format>
 #include <list>
 #include <unordered_map>
@@ -7,8 +10,6 @@
 #include <vector>
 
 #include "StructureStart.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 #include "java/Random.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/Level.h"
@@ -17,6 +18,7 @@
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "minecraft/world/level/storage/LevelData.h"
 
 StructureFeature::StructureFeature() {
 #ifdef ENABLE_STRUCTURE_SAVING
diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h
index 11ba11225..f6fac2aaa 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h
+++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/world/level/levelgen/LargeFeature.h"
 #include "StructureFeatureSavedData.h"
+#include "minecraft/world/level/levelgen/LargeFeature.h"
 
 class StructureStart;
 
diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp
index b774100a2..fb9f3ed46 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp
@@ -1,10 +1,10 @@
+#include "StructureFeatureIO.h"
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include "StructureFeatureIO.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/level/levelgen/structure/MineShaftPieces.h"
 #include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
 #include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h"
@@ -18,6 +18,7 @@
 #include "minecraft/world/level/levelgen/structure/StructureStart.h"
 #include "minecraft/world/level/levelgen/structure/VillageFeature.h"
 #include "minecraft/world/level/levelgen/structure/VillagePieces.h"
+#include "nbt/CompoundTag.h"
 
 class Level;
 
diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
index 5a0179a6b..e39cacbde 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
@@ -1,10 +1,11 @@
+#include "StructureFeatureSavedData.h"
+
 #include <string>
 
-#include "StructureFeatureSavedData.h"
 #include "console_helpers/StringHelpers.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h"
 #include "minecraft/world/level/saveddata/SavedData.h"
+#include "nbt/CompoundTag.h"
 
 std::wstring StructureFeatureSavedData::TAG_FEATURES = L"Features";
 
diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp
index 7fb34792c..979db90fd 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp
@@ -1,17 +1,16 @@
+#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "minecraft/Direction.h"
 #include "java/JavaMath.h"
-#include "minecraft/Facing.h"
-#include "minecraft/world/item/DoorItem.h"
-#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/IntArrayTag.h"
+#include "minecraft/Direction.h"
+#include "minecraft/Facing.h"
+#include "minecraft/util/WeighedTreasure.h"
+#include "minecraft/world/item/DoorItem.h"
 #include "minecraft/world/level/ChunkPos.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/TilePos.h"
@@ -25,6 +24,8 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/ChestTileEntity.h"
 #include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/IntArrayTag.h"
 
 /**
  *
diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h
index 18dc04bf8..d8a831813 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.h
+++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.h
@@ -2,9 +2,9 @@
 
 #include <list>
 
-#include "minecraft/util/WeighedRandom.h"
 #include "BoundingBox.h"
 #include "StructureFeatureIO.h"
+#include "minecraft/util/WeighedRandom.h"
 #include "nbt/CompoundTag.h"
 
 class Level;
diff --git a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp
index a8ad9e5f8..15b494999 100644
--- a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp
@@ -1,13 +1,14 @@
+#include "StructureStart.h"
+
 #include <string>
 
-#include "StructureStart.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/IntArrayTag.h"
-#include "nbt/ListTag.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/IntArrayTag.h"
+#include "nbt/ListTag.h"
 
 StructureStart::StructureStart() {
     chunkX = chunkZ = 0;
diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
index 3b1ab0399..05a34a095 100644
--- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
@@ -1,14 +1,14 @@
+#include "VillageFeature.h"
+
 #include <list>
 #include <utility>
 #include <vector>
 
-#include "VillageFeature.h"
-#include "VillagePieces.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "VillagePieces.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
@@ -17,6 +17,7 @@
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
 #include "minecraft/world/level/levelgen/structure/StructureStart.h"
+#include "nbt/CompoundTag.h"
 
 const std::wstring VillageFeature::OPTION_SIZE_MODIFIER = L"size";
 const std::wstring VillageFeature::OPTION_SPACING = L"distance";
diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp
index 6c90ca96d..898be74f2 100644
--- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp
@@ -1,25 +1,27 @@
+#include "VillagePieces.h"
+
 #include <stdlib.h>
+
 #include <memory>
 #include <string>
 
-#include "minecraft/util/WeighedTreasure.h"
-#include "VillagePieces.h"
 #include "VillageFeature.h"
-#include "minecraft/Direction.h"
 #include "java/JavaMath.h"
-#include "minecraft/world/level/biome/BiomeSource.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/Direction.h"
+#include "minecraft/util/WeighedTreasure.h"
 #include "minecraft/world/entity/npc/Villager.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/biome/BiomeSource.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/levelgen/structure/BoundingBox.h"
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/SandStoneTile.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "nbt/CompoundTag.h"
 
 std::vector<WeighedTreasure*> VillagePieces::Smithy::treasureItems;
 
diff --git a/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h b/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h
index e7dae5ead..a7a9e90bc 100644
--- a/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h
+++ b/targets/minecraft/world/level/levelgen/structure/net.minecraft.world.level.levelgen.structure.h
@@ -7,6 +7,8 @@
 #include "MineShaftStart.h"
 #include "NetherBridgeFeature.h"
 #include "NetherBridgePieces.h"
+#include "RandomScatteredLargeFeature.h"
+#include "ScatteredFeaturePieces.h"
 #include "StrongholdFeature.h"
 #include "StrongholdPieces.h"
 #include "StructureFeature.h"
@@ -15,6 +17,4 @@
 #include "StructurePiece.h"
 #include "StructureStart.h"
 #include "VillageFeature.h"
-#include "VillagePieces.h"
-#include "RandomScatteredLargeFeature.h"
-#include "ScatteredFeaturePieces.h"
\ No newline at end of file
+#include "VillagePieces.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/levelgen/synth/Distort.cpp b/targets/minecraft/world/level/levelgen/synth/Distort.cpp
index f3ae2392f..3558fba29 100644
--- a/targets/minecraft/world/level/levelgen/synth/Distort.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/Distort.cpp
@@ -1,4 +1,5 @@
 #include "Distort.h"
+
 #include "minecraft/world/level/levelgen/synth/Synth.h"
 
 Distort::Distort(Synth* source, Synth* distort) {
diff --git a/targets/minecraft/world/level/levelgen/synth/Emboss.cpp b/targets/minecraft/world/level/levelgen/synth/Emboss.cpp
index 2a8b375cc..c3f2b34df 100644
--- a/targets/minecraft/world/level/levelgen/synth/Emboss.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/Emboss.cpp
@@ -1,4 +1,5 @@
 #include "Emboss.h"
+
 #include "minecraft/world/level/levelgen/synth/Synth.h"
 
 Emboss::Emboss(Synth* synth) { this->synth = synth; }
diff --git a/targets/minecraft/world/level/levelgen/synth/FastNoise.cpp b/targets/minecraft/world/level/levelgen/synth/FastNoise.cpp
index 82b3e5ef6..b4dd49a1c 100644
--- a/targets/minecraft/world/level/levelgen/synth/FastNoise.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/FastNoise.cpp
@@ -1,4 +1,5 @@
 #include "FastNoise.h"
+
 #include "java/Random.h"
 
 FastNoise::FastNoise(int levels) {
diff --git a/targets/minecraft/world/level/levelgen/synth/FastNoise.h b/targets/minecraft/world/level/levelgen/synth/FastNoise.h
index 06d436494..71c61b5f3 100644
--- a/targets/minecraft/world/level/levelgen/synth/FastNoise.h
+++ b/targets/minecraft/world/level/levelgen/synth/FastNoise.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
diff --git a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp
index 7e3b2ad79..600687571 100644
--- a/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/ImprovedNoise.cpp
@@ -1,6 +1,7 @@
+#include "ImprovedNoise.h"
+
 #include <vector>
 
-#include "ImprovedNoise.h"
 #include "java/Random.h"
 
 ImprovedNoise::ImprovedNoise() {
diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp
index eb4c1eb63..045e8a4bd 100644
--- a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.cpp
@@ -1,6 +1,7 @@
+#include "PerlinNoise.h"
+
 #include <stdint.h>
 
-#include "PerlinNoise.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/levelgen/synth/ImprovedNoise.h"
diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.h b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.h
index d943867e8..d36baced8 100644
--- a/targets/minecraft/world/level/levelgen/synth/PerlinNoise.h
+++ b/targets/minecraft/world/level/levelgen/synth/PerlinNoise.h
@@ -2,8 +2,8 @@
 #include <format>
 #include <vector>
 
-#include "Synth.h"
 #include "ImprovedNoise.h"
+#include "Synth.h"
 
 class ImprovedNoise;
 class Random;
diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp
index 7fa08be8d..c7ff0fa78 100644
--- a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.cpp
@@ -1,4 +1,5 @@
 #include "PerlinSimplexNoise.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/levelgen/synth/SimplexNoise.h"
 
diff --git a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h
index b1be7f0d9..6180149bd 100644
--- a/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h
+++ b/targets/minecraft/world/level/levelgen/synth/PerlinSimplexNoise.h
@@ -2,8 +2,8 @@
 #include <format>
 #include <vector>
 
-#include "Synth.h"
 #include "SimplexNoise.h"
+#include "Synth.h"
 
 class Random;
 class SimplexNoise;
diff --git a/targets/minecraft/world/level/levelgen/synth/Rotate.cpp b/targets/minecraft/world/level/levelgen/synth/Rotate.cpp
index 57f576828..0899b9dc2 100644
--- a/targets/minecraft/world/level/levelgen/synth/Rotate.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/Rotate.cpp
@@ -1,6 +1,7 @@
+#include "Rotate.h"
+
 #include <cmath>
 
-#include "Rotate.h"
 #include "minecraft/world/level/levelgen/synth/Synth.h"
 
 Rotate::Rotate(Synth* synth, float angle) {
diff --git a/targets/minecraft/world/level/levelgen/synth/Scale.cpp b/targets/minecraft/world/level/levelgen/synth/Scale.cpp
index a69fcb47d..8dc2f56be 100644
--- a/targets/minecraft/world/level/levelgen/synth/Scale.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/Scale.cpp
@@ -1,4 +1,5 @@
 #include "Scale.h"
+
 #include "minecraft/world/level/levelgen/synth/Synth.h"
 
 Scale::Scale(Synth* synth, double xScale, double yScale) {
diff --git a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp
index 2d81cbc63..a8bc257f9 100644
--- a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp
+++ b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.cpp
@@ -1,7 +1,9 @@
+#include "SimplexNoise.h"
+
 #include <math.h>
+
 #include <vector>
 
-#include "SimplexNoise.h"
 #include "java/Random.h"
 
 int SimplexNoise::grad3[12][3] = {
diff --git a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h
index b3c65d0ca..f9402f0dc 100644
--- a/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h
+++ b/targets/minecraft/world/level/levelgen/synth/SimplexNoise.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <format>
+#include <vector>
 
 class Random;
 
diff --git a/targets/minecraft/world/level/material/Material.cpp b/targets/minecraft/world/level/material/Material.cpp
index 622bbdc25..912583c19 100644
--- a/targets/minecraft/world/level/material/Material.cpp
+++ b/targets/minecraft/world/level/material/Material.cpp
@@ -1,4 +1,5 @@
 #include "Material.h"
+
 #include "DecorationMaterial.h"
 #include "GasMaterial.h"
 #include "LiquidMaterial.h"
diff --git a/targets/minecraft/world/level/net.minecraft.world.level.h b/targets/minecraft/world/level/net.minecraft.world.level.h
index e69d423b4..a70217450 100644
--- a/targets/minecraft/world/level/net.minecraft.world.level.h
+++ b/targets/minecraft/world/level/net.minecraft.world.level.h
@@ -2,15 +2,19 @@
 
 #include "BaseMobSpawner.h"
 #include "BlockDestructionProgress.h"
+#include "Calendar.h"
 #include "ChunkPos.h"
 #include "Coord.h"
 #include "Explosion.h"
 #include "FoliageColor.h"
 #include "GameRules.h"
 #include "GrassColor.h"
+#include "Level.h"
 #include "LevelConflictException.h"
 #include "LevelListener.h"
+#include "LevelSettings.h"
 #include "LevelSource.h"
+#include "LevelType.h"
 #include "LightLayer.h"
 #include "MobSpawner.h"
 #include "PortalForcer.h"
@@ -18,9 +22,4 @@
 #include "TickNextTickData.h"
 #include "TileEventData.h"
 #include "TilePos.h"
-#include "WaterColor.h"
-#include "Level.h"
-#include "LevelType.h"
-#include "LevelSettings.h"
-
-#include "Calendar.h"
\ No newline at end of file
+#include "WaterColor.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp b/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp
index dd328df9d..ae47ee003 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/AddIslandLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/AddIslandLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 AddIslandLayer::AddIslandLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
diff --git a/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.h b/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.h
index d289c3716..b992d0043 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/AddIslandLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp b/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp
index 711a88ffe..1fb3510f7 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 AddMushroomIslandLayer::AddMushroomIslandLayer(int64_t seedMixup,
diff --git a/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h b/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h
index be5f0f539..6d44cf36a 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp b/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp
index 81fa82242..e7ab6a098 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/AddSnowLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/AddSnowLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 AddSnowLayer::AddSnowLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
diff --git a/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.h b/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.h
index ec68d1e04..f0f8cb4b2 100644
--- a/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/AddSnowLayer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp
index 4b37c5a22..a16441c0b 100644
--- a/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.cpp
@@ -1,4 +1,5 @@
 #include "BiomeInitLayer.h"
+
 #include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.h b/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.h
index df665e174..0e4bf00f1 100644
--- a/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/BiomeInitLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp
index d448bcfe2..79505edca 100644
--- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp
@@ -1,9 +1,11 @@
-#include <string.h>
-#include <string>
-#include <fstream>
-#include <filesystem>
-
 #include "BiomeOverrideLayer.h"
+
+#include <string.h>
+
+#include <filesystem>
+#include <fstream>
+#include <string>
+
 #include "Minecraft.Client/Linux/Linux_App.h"
 #if defined(__linux__)
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h
index e7133f034..a976f833b 100644
--- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <vector>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/DownfallLayer.cpp b/targets/minecraft/world/level/newbiome/layer/DownfallLayer.cpp
index 3658b5f8c..986100faf 100644
--- a/targets/minecraft/world/level/newbiome/layer/DownfallLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/DownfallLayer.cpp
@@ -1,9 +1,10 @@
 
+#include "minecraft/world/level/newbiome/layer/DownfallLayer.h"
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/DownfallLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 DownfallLayer::DownfallLayer(std::shared_ptr<Layer> parent) : Layer(0) {
diff --git a/targets/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp b/targets/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp
index a6129b81a..8197cc7eb 100644
--- a/targets/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/DownfallMixerLayer.cpp
@@ -1,9 +1,10 @@
 
+#include "minecraft/world/level/newbiome/layer/DownfallMixerLayer.h"
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/DownfallMixerLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 DownfallMixerLayer::DownfallMixerLayer(std::shared_ptr<Layer> downfall,
diff --git a/targets/minecraft/world/level/newbiome/layer/FlatLayer.cpp b/targets/minecraft/world/level/newbiome/layer/FlatLayer.cpp
index 10d99bf25..4fcf7dd65 100644
--- a/targets/minecraft/world/level/newbiome/layer/FlatLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/FlatLayer.cpp
@@ -1,7 +1,8 @@
 
+#include "minecraft/world/level/newbiome/layer/FlatLayer.h"
+
 #include <vector>
 
-#include "minecraft/world/level/newbiome/layer/FlatLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 FlatLayer::FlatLayer(int val) : Layer(0) { this->val = val; }
diff --git a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp
index 1a87a0d5d..1e1040021 100644
--- a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
-#include "minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 FuzzyZoomLayer::FuzzyZoomLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
diff --git a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h
index b655c5e2c..b7564714c 100644
--- a/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp b/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp
index 839b98fd3..17b4e8e38 100644
--- a/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
-#include "minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 GrowMushroomIslandLayer::GrowMushroomIslandLayer(int64_t seedMixup,
diff --git a/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h b/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h
index a7489f0d0..14feab8b6 100644
--- a/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp b/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp
index 3ae9a456d..677b69b33 100644
--- a/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/IslandLayer.cpp
@@ -1,8 +1,10 @@
 
-#include <stdint.h>
-#include <vector>
-
 #include "minecraft/world/level/newbiome/layer/IslandLayer.h"
+
+#include <stdint.h>
+
+#include <vector>
+
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
 IslandLayer::IslandLayer(int64_t seedMixup) : Layer(seedMixup) {}
diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp
index b4d0b20ec..c247363e8 100644
--- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp
@@ -1,4 +1,7 @@
+#include "minecraft/world/level/newbiome/layer/Layer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
@@ -13,7 +16,6 @@
 #include "minecraft/world/level/newbiome/layer/FuzzyZoomLayer.h"
 #include "minecraft/world/level/newbiome/layer/GrowMushroomIslandLayer.h"
 #include "minecraft/world/level/newbiome/layer/IslandLayer.h"
-#include "minecraft/world/level/newbiome/layer/Layer.h"
 #include "minecraft/world/level/newbiome/layer/RegionHillsLayer.h"
 #include "minecraft/world/level/newbiome/layer/RiverInitLayer.h"
 #include "minecraft/world/level/newbiome/layer/RiverLayer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.h b/targets/minecraft/world/level/newbiome/layer/Layer.h
index 62b836c6f..7d1549d01 100644
--- a/targets/minecraft/world/level/newbiome/layer/Layer.h
+++ b/targets/minecraft/world/level/newbiome/layer/Layer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <vector>
diff --git a/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp b/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp
index b0aa9022d..c2b5388af 100644
--- a/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.cpp
@@ -1,6 +1,7 @@
+#include "RegionHillsLayer.h"
+
 #include <vector>
 
-#include "RegionHillsLayer.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
diff --git a/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.h b/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.h
index 076d1cad1..648aaa159 100644
--- a/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/RegionHillsLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp b/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp
index 6281c0976..c910851b1 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/RiverInitLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/RiverInitLayer.h"
 
 RiverInitLayer::RiverInitLayer(int64_t seed, std::shared_ptr<Layer> parent)
     : Layer(seed) {
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.h b/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.h
index 4e8def837..1e976923d 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/RiverInitLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverLayer.cpp b/targets/minecraft/world/level/newbiome/layer/RiverLayer.cpp
index fca1a361f..a95083c35 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/RiverLayer.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/RiverLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/RiverLayer.h"
 
 RiverLayer::RiverLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
     : Layer(seedMixup) {
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverLayer.h b/targets/minecraft/world/level/newbiome/layer/RiverLayer.h
index f4aed11bc..f6c183fd5 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/RiverLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp
index 1c6df298b..75e9b75a6 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/RiverMixerLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/RiverMixerLayer.h"
 
 RiverMixerLayer::RiverMixerLayer(int64_t seed, std::shared_ptr<Layer> biomes,
                                  std::shared_ptr<Layer> rivers)
diff --git a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.h b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.h
index b972fc322..f542e59cd 100644
--- a/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/RiverMixerLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/ShoreLayer.cpp b/targets/minecraft/world/level/newbiome/layer/ShoreLayer.cpp
index 7f041e768..665fb149f 100644
--- a/targets/minecraft/world/level/newbiome/layer/ShoreLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/ShoreLayer.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/ShoreLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/ShoreLayer.h"
 
 ShoreLayer::ShoreLayer(int64_t seed, std::shared_ptr<Layer> parent)
     : Layer(seed) {
diff --git a/targets/minecraft/world/level/newbiome/layer/ShoreLayer.h b/targets/minecraft/world/level/newbiome/layer/ShoreLayer.h
index df1e1dc8c..b5c4bb091 100644
--- a/targets/minecraft/world/level/newbiome/layer/ShoreLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/ShoreLayer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/SmoothLayer.cpp b/targets/minecraft/world/level/newbiome/layer/SmoothLayer.cpp
index 4fe23d7c3..edf40b2a9 100644
--- a/targets/minecraft/world/level/newbiome/layer/SmoothLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/SmoothLayer.cpp
@@ -1,10 +1,12 @@
 
+#include "minecraft/world/level/newbiome/layer/SmoothLayer.h"
+
 #include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/SmoothLayer.h"
 
 SmoothLayer::SmoothLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
     : Layer(seedMixup) {
diff --git a/targets/minecraft/world/level/newbiome/layer/SmoothLayer.h b/targets/minecraft/world/level/newbiome/layer/SmoothLayer.h
index 7dc2974e1..6c84241b4 100644
--- a/targets/minecraft/world/level/newbiome/layer/SmoothLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/SmoothLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp b/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp
index ff15c8042..736e137f6 100644
--- a/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/SmoothZoomLayer.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/SmoothZoomLayer.h"
 
 SmoothZoomLayer::SmoothZoomLayer(int64_t seedMixup,
                                  std::shared_ptr<Layer> parent)
diff --git a/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h b/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h
index e6ddf6073..8969e76be 100644
--- a/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/SmoothZoomLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp b/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp
index 111d486f6..91c569c55 100644
--- a/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.cpp
@@ -1,6 +1,7 @@
+#include "SwampRiversLayer.h"
+
 #include <vector>
 
-#include "SwampRiversLayer.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
 
diff --git a/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.h b/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.h
index 1051f997b..8120fdc9a 100644
--- a/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/SwampRiversLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp b/targets/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp
index fd396b9c4..b9c5030ee 100644
--- a/targets/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/TemperatureLayer.cpp
@@ -1,10 +1,11 @@
 
+#include "minecraft/world/level/newbiome/layer/TemperatureLayer.h"
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/TemperatureLayer.h"
 
 TemperatureLayer::TemperatureLayer(std::shared_ptr<Layer> parent) : Layer(0) {
     this->parent = parent;
diff --git a/targets/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp b/targets/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp
index 325bc7735..7fc0b8193 100644
--- a/targets/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/TemperatureMixerLayer.cpp
@@ -1,10 +1,11 @@
 
+#include "minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h"
+
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/TemperatureMixerLayer.h"
 
 TemperatureMixerLayer::TemperatureMixerLayer(std::shared_ptr<Layer> temp,
                                              std::shared_ptr<Layer> parent,
diff --git a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp
index c98398079..2e51cb537 100644
--- a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/VoronoiZoom.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/VoronoiZoom.h"
 
 VoronoiZoom::VoronoiZoom(int64_t seedMixup, std::shared_ptr<Layer> parent)
     : Layer(seedMixup) {
diff --git a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.h b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.h
index 138aa3d9d..09d9efd5b 100644
--- a/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.h
+++ b/targets/minecraft/world/level/newbiome/layer/VoronoiZoom.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp
index ac8363867..ad47faba7 100644
--- a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp
+++ b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.cpp
@@ -1,11 +1,13 @@
 
+#include "minecraft/world/level/newbiome/layer/ZoomLayer.h"
+
 #include <stdint.h>
+
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "minecraft/world/level/newbiome/layer/Layer.h"
-#include "minecraft/world/level/newbiome/layer/ZoomLayer.h"
 
 ZoomLayer::ZoomLayer(int64_t seedMixup, std::shared_ptr<Layer> parent)
     : Layer(seedMixup) {
diff --git a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.h b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.h
index 9503533c4..e65afcbca 100644
--- a/targets/minecraft/world/level/newbiome/layer/ZoomLayer.h
+++ b/targets/minecraft/world/level/newbiome/layer/ZoomLayer.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "Layer.h"
diff --git a/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h b/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h
index f3f866343..b41a510d3 100644
--- a/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h
+++ b/targets/minecraft/world/level/newbiome/layer/net.minecraft.world.level.newbiome.layer.h
@@ -8,6 +8,7 @@
 #include "DownfallMixerLayer.h"
 #include "FlatLayer.h"
 #include "FuzzyZoomLayer.h"
+#include "GrowMushroomIslandLayer.h"  // 4J added
 #include "IslandLayer.h"
 #include "Layer.h"
 #include "RiverInitLayer.h"
@@ -20,7 +21,6 @@
 #include "TemperatureMixerLayer.h"
 #include "VoronoiZoom.h"
 #include "ZoomLayer.h"
-#include "GrowMushroomIslandLayer.h"  // 4J added
 
 // 1.1.
 #include "RegionHillsLayer.h"
diff --git a/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp b/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp
index 16a94a60e..db46726ce 100644
--- a/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp
+++ b/targets/minecraft/world/level/pathfinder/BinaryHeap.cpp
@@ -1,8 +1,9 @@
-#include <limits>
+#include "BinaryHeap.h"
+
 #include <algorithm>
+#include <limits>
 
 #include "Node.h"
-#include "BinaryHeap.h"
 
 // 4J Jev, add common ctor code.
 void BinaryHeap::_init() {
diff --git a/targets/minecraft/world/level/pathfinder/Node.cpp b/targets/minecraft/world/level/pathfinder/Node.cpp
index 24c8a2b47..421cdef0c 100644
--- a/targets/minecraft/world/level/pathfinder/Node.cpp
+++ b/targets/minecraft/world/level/pathfinder/Node.cpp
@@ -1,12 +1,14 @@
 
 // 4J - added for common ctor code
 // Do all the default initialisations done in the java class
+#include "minecraft/world/level/pathfinder/Node.h"
+
 #include <stdint.h>
+
 #include <string>
 
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/util/Mth.h"
-#include "minecraft/world/level/pathfinder/Node.h"
 
 void Node::_init() {
     heapIdx = -1;
diff --git a/targets/minecraft/world/level/pathfinder/Path.cpp b/targets/minecraft/world/level/pathfinder/Path.cpp
index 07730b153..1dda37b27 100644
--- a/targets/minecraft/world/level/pathfinder/Path.cpp
+++ b/targets/minecraft/world/level/pathfinder/Path.cpp
@@ -1,6 +1,7 @@
+#include "Path.h"
+
 #include <string.h>
 
-#include "Path.h"
 #include "minecraft/world/entity/Entity.h"
 
 Path::~Path() {
diff --git a/targets/minecraft/world/level/pathfinder/PathFinder.cpp b/targets/minecraft/world/level/pathfinder/PathFinder.cpp
index 342f65c1e..1a4529f60 100644
--- a/targets/minecraft/world/level/pathfinder/PathFinder.cpp
+++ b/targets/minecraft/world/level/pathfinder/PathFinder.cpp
@@ -1,3 +1,5 @@
+#include "PathFinder.h"
+
 #include <cmath>
 #include <utility>
 #include <vector>
@@ -5,7 +7,6 @@
 #include "BinaryHeap.h"
 #include "Node.h"
 #include "Path.h"
-#include "PathFinder.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp
index c4ad21371..299ccf05a 100644
--- a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp
+++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp
@@ -1,18 +1,20 @@
+#include "MapItemSavedData.h"
+
 #include <string.h>
+
 #include <algorithm>
 #include <utility>
 
-#include "MapItemSavedData.h"
-#include "minecraft/server/PlayerList.h"
 #include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
 #include "minecraft/server/level/ServerPlayer.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/entity/ItemFrame.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/item/MapItem.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/storage/LevelData.h"
+#include "nbt/CompoundTag.h"
 
 const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1;
 
diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.h b/targets/minecraft/world/level/saveddata/MapItemSavedData.h
index 672fc803b..9868c694a 100644
--- a/targets/minecraft/world/level/saveddata/MapItemSavedData.h
+++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.h
@@ -1,14 +1,15 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "minecraft/world/entity/player/Player.h"
 #include "SavedData.h"
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/saveddata/SavedData.h"
 
 class ItemInstance;
diff --git a/targets/minecraft/world/level/saveddata/SavedData.cpp b/targets/minecraft/world/level/saveddata/SavedData.cpp
index fea8af2d7..8428873f5 100644
--- a/targets/minecraft/world/level/saveddata/SavedData.cpp
+++ b/targets/minecraft/world/level/saveddata/SavedData.cpp
@@ -1,7 +1,8 @@
 
+#include "SavedData.h"
+
 #include <string>
 
-#include "SavedData.h"
 #include "minecraft/world/level/saveddata/SavedData.h"
 
 SavedData::SavedData(const std::wstring& id) : id(id) { dirty = false; }
diff --git a/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h b/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h
index 11878d9e8..5174cd3a7 100644
--- a/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h
+++ b/targets/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#include "SavedData.h"
-#include "MapItemSavedData.h"
\ No newline at end of file
+#include "MapItemSavedData.h"
+#include "SavedData.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
index a0fbd9624..61bbd4924 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <string>
-#include "java/File.h"
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "java/File.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 enum class SaveFileSeekOrigin { Begin, Current, End };
 
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
index ed1a57fa3..64a40cb7d 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
@@ -1,9 +1,10 @@
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h"
-#include "minecraft/util/ProgressListener.h"
+
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
+#include "minecraft/util/ProgressListener.h"
+#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
+#include "minecraft/world/level/storage/net.minecraft.world.level.storage.h"
 
 void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave,
                                                  FileEntry* sourceFileEntry,
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
index 179d76bba..a2cedc704 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
@@ -1,8 +1,11 @@
 #pragma once
+
 #include "java/File.h"
+
 class FileEntry;
 class ConsoleSaveFile;
 class ProgressRenderer;
+class ProgressListener;
 
 // 4J Stu - This code is taken from the standalone save converter tool, and
 // modified slightly
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h
index 66e84ebf1..107350f5e 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
\ No newline at end of file
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
index 004e0a21b..3098979f9 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
@@ -1,9 +1,11 @@
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+
 #include <assert.h>
+
 #include <cstdint>
 #include <vector>
 
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
 
 class ConsoleSavePath;
 
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
index 0386a0a4b..9e72010b3 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@@ -1,7 +1,10 @@
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+
 #include <assert.h>
 #include <wchar.h>
-#include <chrono>
+
 #include <algorithm>
+#include <chrono>
 #include <compare>
 #include <cstdint>
 #include <cstring>
@@ -9,30 +12,29 @@
 #include <format>
 #include <vector>
 
-#include "console_helpers/PortableFileIO.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "java/File.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "4J.Common/4J_Compat.h"
-#include "platform/IPlatformStorage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/PortableFileIO.h"
 #include "console_helpers/compression.h"
+#include "java/File.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/world/level/chunk/storage/RegionFile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/LevelData.h"
+#include "platform/IPlatformStorage.h"
 #include "platform/PlatformServices.h"
 
 #define RESERVE_ALLOCATION MEM_RESERVE
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
index e5b03c66c..5e99bb8f8 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
@@ -2,11 +2,10 @@
 #include <mutex>
 #include <string>
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class ConsoleSaveFileOriginal : public ConsoleSaveFile {
 private:
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
index bfc27c78e..c6b472d7e 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
@@ -1,8 +1,10 @@
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+
 #include <assert.h>
+
 #include <cstdint>
 #include <vector>
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 
 class ConsoleSavePath;
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
index 3ba0d8594..5ecb8bee0 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@@ -1,43 +1,44 @@
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include <thread>
-#include <chrono>
+
 #include <algorithm>
+#include <chrono>
 #include <compare>
+#include <ctime>
 #include <format>
+#include <thread>
 #include <utility>
 
-#include "console_helpers/PortableFileIO.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h"
-#include "java/File.h"
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/level/ServerLevel.h"
-#include "minecraft/world/level/storage/LevelData.h"
-#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "4J.Common/4J_Compat.h"
-#include "platform/IPlatformStorage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
+#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "console_helpers/compression.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "console_helpers/PlatformTime.h"
-#include <ctime>
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "java/File.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
-#include "java/File.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/world/level/chunk/storage/RegionFile.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/LevelData.h"
+#include "platform/IPlatformStorage.h"
 #include "platform/PlatformServices.h"
 
 class ProgressListener;
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
index fa86de053..d3e02251a 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
@@ -1,15 +1,14 @@
 #pragma once
-#include <mutex>
 #include <cstdint>
+#include <mutex>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class ProgressRenderer;
 class ProgressListener;
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
index c2dac053c..153295373 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
@@ -1,21 +1,23 @@
 
 // #define _DEBUG_FILE_HEADER
 
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+
 #include <assert.h>
 #include <string.h>
 #include <wchar.h>
+
 #include <algorithm>
 #include <compare>
 #include <format>
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "console_helpers/Definitions.h"
 #include "java/System.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 extern CConsoleMinecraftApp app;
 
diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
index 5ae95f90a..d8a837bac 100644
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "console_helpers/Definitions.h"
-
+#include <chrono>
 #include <cstring>
 #include <string>
 #include <vector>
-#include <chrono>
+
+#include "console_helpers/Definitions.h"
 
 #define MAKE_FOURCC(ch0, ch1, ch2, ch3)                                   \
     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) |         \
diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.cpp b/targets/minecraft/world/level/storage/DerivedLevelData.cpp
index bcb32d485..2ec417152 100644
--- a/targets/minecraft/world/level/storage/DerivedLevelData.cpp
+++ b/targets/minecraft/world/level/storage/DerivedLevelData.cpp
@@ -1,4 +1,5 @@
 #include "DerivedLevelData.h"
+
 #include "minecraft/world/level/storage/LevelData.h"
 
 class CompoundTag;
diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.h b/targets/minecraft/world/level/storage/DerivedLevelData.h
index 80ded27d8..7f265e781 100644
--- a/targets/minecraft/world/level/storage/DerivedLevelData.h
+++ b/targets/minecraft/world/level/storage/DerivedLevelData.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp
index 143278310..4783b62e0 100644
--- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp
+++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp
@@ -1,45 +1,47 @@
+#include "DirectoryLevelStorage.h"
+
 #include <assert.h>
 #include <float.h>
 #include <stdio.h>
+
 #include <algorithm>
 #include <format>
 #include <memory>
 #include <utility>
 
-#include "java/System.h"
-#include "java/File.h"
-#include "java/InputOutputStream/DataInputStream.h"
 #include "LevelData.h"
-#include "DirectoryLevelStorage.h"
-#include "platform/IPlatformStorage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
-#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
+#include "console_helpers/StringHelpers.h"
+#include "java/File.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/InputOutputStream/FileOutputStream.h"
-#include "nbt/CompoundTag.h"
-#include "nbt/DoubleTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/NbtIo.h"
+#include "java/System.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/dimension/HellDimension.h"
 #include "minecraft/world/level/dimension/TheEndDimension.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "minecraft/world/level/storage/LevelStorage.h"
 #include "minecraft/world/level/storage/PlayerIO.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
+#include "nbt/CompoundTag.h"
+#include "nbt/DoubleTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/NbtIo.h"
+#include "platform/IPlatformStorage.h"
 #include "platform/PlatformServices.h"
 
 const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/");
diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h
index 2ccbfd301..efb8a40e6 100644
--- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h
+++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h
@@ -26,17 +26,17 @@
 #define END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION 5
 
 #include <stdint.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "java/File.h"
-#include "nbt/CompoundTag.h"
-
+#include "4J.Common/4J_Compat.h"
 #include "LevelStorage.h"
 #include "PlayerIO.h"
+#include "java/File.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "4J.Common/4J_Compat.h"
+#include "nbt/CompoundTag.h"
 
 class ConsoleSaveFile;
 class ByteArrayOutputStream;
diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
index 012282869..d736776c0 100644
--- a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
+++ b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
@@ -1,13 +1,14 @@
+#include "DirectoryLevelStorageSource.h"
+
 #include <memory>
 #include <vector>
 
-#include "java/File.h"
-#include "LevelData.h"
 #include "DirectoryLevelStorage.h"
-#include "DirectoryLevelStorageSource.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "LevelData.h"
+#include "java/File.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "nbt/CompoundTag.h"
diff --git a/targets/minecraft/world/level/storage/LevelData.cpp b/targets/minecraft/world/level/storage/LevelData.cpp
index 083168948..2859056e1 100644
--- a/targets/minecraft/world/level/storage/LevelData.cpp
+++ b/targets/minecraft/world/level/storage/LevelData.cpp
@@ -1,17 +1,19 @@
+#include "LevelData.h"
+
 #include <assert.h>
+
 #include <algorithm>
 #include <cmath>
 
-#include "java/System.h"
-#include "LevelData.h"
-#include "minecraft/world/level/LevelType.h"
-#include "minecraft/world/level/LevelSettings.h"
 #include "Minecraft.Client/Common/App_Defines.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "nbt/CompoundTag.h"
+#include "java/System.h"
 #include "minecraft/world/level/GameRules.h"
+#include "minecraft/world/level/LevelSettings.h"
+#include "minecraft/world/level/LevelType.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
+#include "nbt/CompoundTag.h"
 
 LevelData::LevelData() {}
 
diff --git a/targets/minecraft/world/level/storage/LevelData.h b/targets/minecraft/world/level/storage/LevelData.h
index ce0f51abd..abdff145c 100644
--- a/targets/minecraft/world/level/storage/LevelData.h
+++ b/targets/minecraft/world/level/storage/LevelData.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <format>
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "minecraft/world/level/GameRules.h"
 
diff --git a/targets/minecraft/world/level/storage/LevelStorage.h b/targets/minecraft/world/level/storage/LevelStorage.h
index bb4fc9658..6a4283ecf 100644
--- a/targets/minecraft/world/level/storage/LevelStorage.h
+++ b/targets/minecraft/world/level/storage/LevelStorage.h
@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "4J.Common/4J_Compat.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 class PlayerIO;
 class Dimension;
diff --git a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
index 3415ea43d..e3e52e19d 100644
--- a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
+++ b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
@@ -1,6 +1,7 @@
 #include "LevelStorageProfilerDecorator.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+
 #include "minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "minecraft/world/level/storage/LevelStorage.h"
 
 LevelStorageProfilerDecorator::LevelStorageProfilerDecorator(
diff --git a/targets/minecraft/world/level/storage/LevelStorageSource.h b/targets/minecraft/world/level/storage/LevelStorageSource.h
index 0adfc2cd2..54aeffe71 100644
--- a/targets/minecraft/world/level/storage/LevelStorageSource.h
+++ b/targets/minecraft/world/level/storage/LevelStorageSource.h
@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 class LevelSummary;
 class ProgressListener;
diff --git a/targets/minecraft/world/level/storage/LevelSummary.h b/targets/minecraft/world/level/storage/LevelSummary.h
index 89dafa817..e4f41630f 100644
--- a/targets/minecraft/world/level/storage/LevelSummary.h
+++ b/targets/minecraft/world/level/storage/LevelSummary.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <string>
 
 class GameType;
diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp
index 7ce84cc7c..c6aaa7234 100644
--- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp
+++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp
@@ -1,18 +1,20 @@
+#include "McRegionLevelStorage.h"
+
 #include <stdint.h>
+
 #include <format>
 #include <vector>
 
 #include "LevelData.h"
-#include "java/File.h"
-#include "McRegionLevelStorage.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/File.h"
 #include "minecraft/world/level/chunk/storage/McRegionChunkStorage.h"
 #include "minecraft/world/level/chunk/storage/RegionFileCache.h"
 #include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/dimension/HellDimension.h"
 #include "minecraft/world/level/dimension/TheEndDimension.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "minecraft/world/level/storage/DirectoryLevelStorage.h"
 #include "minecraft/world/level/storage/LevelStorage.h"
 
diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp
index 028940fc7..7bacb0eb2 100644
--- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp
+++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp
@@ -1,12 +1,14 @@
+#include "McRegionLevelStorageSource.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "java/JavaMath.h"
-#include "minecraft/util/ProgressListener.h"
+#include "LevelData.h"
 #include "McRegionLevelStorage.h"
 #include "java/File.h"
-#include "LevelData.h"
-#include "McRegionLevelStorageSource.h"
+#include "java/JavaMath.h"
+#include "minecraft/util/ProgressListener.h"
 #include "minecraft/world/level/storage/DirectoryLevelStorageSource.h"
 
 McRegionLevelStorageSource::McRegionLevelStorageSource(File dir)
diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h
index 8bf6566b2..69dbcd037 100644
--- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h
+++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h
@@ -5,9 +5,9 @@
 #include <vector>
 
 #include "DirectoryLevelStorageSource.h"
+#include "java/File.h"
 #include "java/FileFilter.h"
 #include "java/FilenameFilter.h"
-#include "java/File.h"
 
 class ProgressListener;
 class LevelStorage;
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
index aeb5ecab0..e89c7fe9d 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp
@@ -1,11 +1,11 @@
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "nbt/com.mojang.nbt.h"
 #include "MemoryLevelStorage.h"
 
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+#include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
+#include "nbt/com.mojang.nbt.h"
 
 MemoryLevelStorage::MemoryLevelStorage() {}
 
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.h b/targets/minecraft/world/level/storage/MemoryLevelStorage.h
index 54a0cd375..51da696cc 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorage.h
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.h
@@ -2,14 +2,12 @@
 
 #include "LevelStorage.h"
 #include "PlayerIO.h"
-
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
 #include "minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
-#include "nbt/com.mojang.nbt.h"
-
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "nbt/com.mojang.nbt.h"
 
 class MemoryLevelStorage : public LevelStorage, public PlayerIO {
 public:
diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
index 559ab14e2..8ddc7c2e3 100644
--- a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
+++ b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp
@@ -1,8 +1,9 @@
-#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "MemoryLevelStorage.h"
-#include "LevelSummary.h"
 #include "MemoryLevelStorageSource.h"
 
+#include "LevelSummary.h"
+#include "MemoryLevelStorage.h"
+#include "minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
+
 MemoryLevelStorageSource::MemoryLevelStorageSource() {}
 
 std::wstring MemoryLevelStorageSource::getName() { return L"Memory Storage"; }
diff --git a/targets/minecraft/world/level/storage/MockedLevelStorage.cpp b/targets/minecraft/world/level/storage/MockedLevelStorage.cpp
index e90c3f9ac..61d5df9cf 100644
--- a/targets/minecraft/world/level/storage/MockedLevelStorage.cpp
+++ b/targets/minecraft/world/level/storage/MockedLevelStorage.cpp
@@ -1,4 +1,5 @@
 #include "MockedLevelStorage.h"
+
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 LevelData* MockedLevelStorage::prepareLevel() { return nullptr; }
diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.cpp b/targets/minecraft/world/level/storage/SavedDataStorage.cpp
index c46325e78..3f8fa00b3 100644
--- a/targets/minecraft/world/level/storage/SavedDataStorage.cpp
+++ b/targets/minecraft/world/level/storage/SavedDataStorage.cpp
@@ -1,24 +1,26 @@
+#include "SavedDataStorage.h"
+
 #include <assert.h>
+
 #include <algorithm>
 #include <utility>
 
-#include "SavedDataStorage.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/entity/ai/village/Villages.h"
+#include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h"
+#include "minecraft/world/level/saveddata/MapItemSavedData.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "java/InputOutputStream/DataInputStream.h"
-#include "java/InputOutputStream/DataOutputStream.h"
+#include "minecraft/world/level/storage/DirectoryLevelStorage.h"
+#include "minecraft/world/level/storage/LevelStorage.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/NbtIo.h"
 #include "nbt/ShortTag.h"
 #include "nbt/Tag.h"
-#include "minecraft/world/entity/ai/village/Villages.h"
-#include "minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h"
-#include "minecraft/world/level/saveddata/MapItemSavedData.h"
-#include "minecraft/world/level/storage/DirectoryLevelStorage.h"
-#include "minecraft/world/level/storage/LevelStorage.h"
 
 SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) {
     /*
diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.h b/targets/minecraft/world/level/storage/SavedDataStorage.h
index 26b36953e..a318d0511 100644
--- a/targets/minecraft/world/level/storage/SavedDataStorage.h
+++ b/targets/minecraft/world/level/storage/SavedDataStorage.h
@@ -6,7 +6,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "minecraft/world/level/saveddata/SavedData.h"
 #include "4J.Common/4J_Compat.h"
 #include "minecraft/world/level/saveddata/SavedData.h"
 
diff --git a/targets/minecraft/world/level/tile/AirTile.cpp b/targets/minecraft/world/level/tile/AirTile.cpp
index 0fe3c96a2..4707e594e 100644
--- a/targets/minecraft/world/level/tile/AirTile.cpp
+++ b/targets/minecraft/world/level/tile/AirTile.cpp
@@ -1,4 +1,5 @@
 #include "AirTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/AnvilTile.cpp b/targets/minecraft/world/level/tile/AnvilTile.cpp
index f9d99e823..61e66ee7c 100644
--- a/targets/minecraft/world/level/tile/AnvilTile.cpp
+++ b/targets/minecraft/world/level/tile/AnvilTile.cpp
@@ -1,12 +1,12 @@
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "net.minecraft.world.level.tile.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/net.minecraft.h"
 #include "AnvilTile.h"
-#include "minecraft/util/Mth.h"
 
+#include "minecraft/net.minecraft.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "net.minecraft.world.level.tile.h"
 #include "strings.h"
 
 const unsigned int AnvilTile::ANVIL_NAMES[ANVIL_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/BaseEntityTile.cpp b/targets/minecraft/world/level/tile/BaseEntityTile.cpp
index 67e96896c..ede66e436 100644
--- a/targets/minecraft/world/level/tile/BaseEntityTile.cpp
+++ b/targets/minecraft/world/level/tile/BaseEntityTile.cpp
@@ -1,9 +1,10 @@
+#include "BaseEntityTile.h"
+
 #include <memory>
 
-#include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "BaseEntityTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 class Material;
 
diff --git a/targets/minecraft/world/level/tile/BaseEntityTile.h b/targets/minecraft/world/level/tile/BaseEntityTile.h
index 9da7dd0fb..6157aaea3 100644
--- a/targets/minecraft/world/level/tile/BaseEntityTile.h
+++ b/targets/minecraft/world/level/tile/BaseEntityTile.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Tile.h"
 #include "EntityTile.h"
+#include "Tile.h"
 
 class TileEntity;
 class Material;
diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp
index f99b838db..849b254c3 100644
--- a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp
+++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp
@@ -1,9 +1,10 @@
+#include "BasePressurePlateTile.h"
+
 #include <optional>
 
-#include "BasePressurePlateTile.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/Facing.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/BaseRailTile.cpp b/targets/minecraft/world/level/tile/BaseRailTile.cpp
index f0c6d52d3..0260fa7f0 100644
--- a/targets/minecraft/world/level/tile/BaseRailTile.cpp
+++ b/targets/minecraft/world/level/tile/BaseRailTile.cpp
@@ -1,6 +1,7 @@
+#include "BaseRailTile.h"
+
 #include <optional>
 
-#include "BaseRailTile.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/BaseRailTile.h b/targets/minecraft/world/level/tile/BaseRailTile.h
index 8f6ea384c..85316a3d9 100644
--- a/targets/minecraft/world/level/tile/BaseRailTile.h
+++ b/targets/minecraft/world/level/tile/BaseRailTile.h
@@ -3,8 +3,8 @@
 #include <vector>
 
 #include "Tile.h"
-#include "minecraft/world/level/TilePos.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/TilePos.h"
 
 class Random;
 class HitResult;
diff --git a/targets/minecraft/world/level/tile/BeaconTile.cpp b/targets/minecraft/world/level/tile/BeaconTile.cpp
index 4391281e9..cc00dc57f 100644
--- a/targets/minecraft/world/level/tile/BeaconTile.cpp
+++ b/targets/minecraft/world/level/tile/BeaconTile.cpp
@@ -1,7 +1,8 @@
+#include "BeaconTile.h"
+
 #include <memory>
 #include <string>
 
-#include "BeaconTile.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/BedTile.cpp b/targets/minecraft/world/level/tile/BedTile.cpp
index 01a1d98c5..b8845362a 100644
--- a/targets/minecraft/world/level/tile/BedTile.cpp
+++ b/targets/minecraft/world/level/tile/BedTile.cpp
@@ -1,10 +1,11 @@
-#include "minecraft/world/level/dimension/Dimension.h"
+#include "BedTile.h"
+
 #include "minecraft/net.minecraft.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "BedTile.h"
 
 int BedTile::HEAD_DIRECTION_OFFSETS[4][2] = {{0, 1}, {-1, 0}, {0, -1}, {1, 0}};
 
diff --git a/targets/minecraft/world/level/tile/BookshelfTile.cpp b/targets/minecraft/world/level/tile/BookshelfTile.cpp
index a1b266905..078764122 100644
--- a/targets/minecraft/world/level/tile/BookshelfTile.cpp
+++ b/targets/minecraft/world/level/tile/BookshelfTile.cpp
@@ -1,4 +1,5 @@
 #include "BookshelfTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/BrewingStandTile.cpp b/targets/minecraft/world/level/tile/BrewingStandTile.cpp
index 5c0cc7f9b..048296eff 100644
--- a/targets/minecraft/world/level/tile/BrewingStandTile.cpp
+++ b/targets/minecraft/world/level/tile/BrewingStandTile.cpp
@@ -1,11 +1,10 @@
+#include "BrewingStandTile.h"
+
 #include <memory>
 #include <string>
 
-#include "BrewingStandTile.h"
-#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
@@ -16,7 +15,9 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/BaseEntityTile.h"
+#include "minecraft/world/level/tile/entity/BrewingStandTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/level/tile/ButtonTile.cpp b/targets/minecraft/world/level/tile/ButtonTile.cpp
index d21048303..c1b3204b0 100644
--- a/targets/minecraft/world/level/tile/ButtonTile.cpp
+++ b/targets/minecraft/world/level/tile/ButtonTile.cpp
@@ -1,10 +1,11 @@
-#include <optional>
+#include "ButtonTile.h"
+
 #include <format>
+#include <optional>
 #include <vector>
 
-#include "ButtonTile.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/projectile/Arrow.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/CactusTile.cpp b/targets/minecraft/world/level/tile/CactusTile.cpp
index 960ce7ebe..324730887 100644
--- a/targets/minecraft/world/level/tile/CactusTile.cpp
+++ b/targets/minecraft/world/level/tile/CactusTile.cpp
@@ -1,8 +1,9 @@
+#include "CactusTile.h"
+
 #include <memory>
 #include <optional>
 #include <string>
 
-#include "CactusTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/damageSource/DamageSource.h"
diff --git a/targets/minecraft/world/level/tile/CactusTile.h b/targets/minecraft/world/level/tile/CactusTile.h
index 5ad8e21eb..d2102d038 100644
--- a/targets/minecraft/world/level/tile/CactusTile.h
+++ b/targets/minecraft/world/level/tile/CactusTile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Tile.h"
-#include "minecraft/world/level/material/Material.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/material/Material.h"
 
 class Random;
 class Level;
diff --git a/targets/minecraft/world/level/tile/CakeTile.cpp b/targets/minecraft/world/level/tile/CakeTile.cpp
index aa9a68a60..bc2849c90 100644
--- a/targets/minecraft/world/level/tile/CakeTile.cpp
+++ b/targets/minecraft/world/level/tile/CakeTile.cpp
@@ -1,7 +1,8 @@
+#include "CakeTile.h"
+
 #include <optional>
 #include <string>
 
-#include "CakeTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/level/tile/CakeTile.h b/targets/minecraft/world/level/tile/CakeTile.h
index cac16b781..36c152e21 100644
--- a/targets/minecraft/world/level/tile/CakeTile.h
+++ b/targets/minecraft/world/level/tile/CakeTile.h
@@ -2,8 +2,8 @@
 #include <memory>
 
 #include "Tile.h"
-#include "minecraft/world/level/material/Material.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/material/Material.h"
 
 class Player;
 class Random;
diff --git a/targets/minecraft/world/level/tile/CarrotTile.cpp b/targets/minecraft/world/level/tile/CarrotTile.cpp
index c38667696..9e84af894 100644
--- a/targets/minecraft/world/level/tile/CarrotTile.cpp
+++ b/targets/minecraft/world/level/tile/CarrotTile.cpp
@@ -1,6 +1,7 @@
+#include "CarrotTile.h"
+
 #include <string>
 
-#include "CarrotTile.h"
 #include "console_helpers/StringHelpers.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/level/tile/CauldronTile.cpp b/targets/minecraft/world/level/tile/CauldronTile.cpp
index 9d439ea60..003565cd0 100644
--- a/targets/minecraft/world/level/tile/CauldronTile.cpp
+++ b/targets/minecraft/world/level/tile/CauldronTile.cpp
@@ -1,10 +1,11 @@
+#include "CauldronTile.h"
+
 #include <memory>
 
-#include "CauldronTile.h"
-#include "minecraft/Facing.h"
-#include "minecraft/server/level/ServerPlayer.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/Facing.h"
+#include "minecraft/server/level/ServerPlayer.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
 #include "minecraft/world/entity/player/Abilities.h"
diff --git a/targets/minecraft/world/level/tile/ChestTile.cpp b/targets/minecraft/world/level/tile/ChestTile.cpp
index f31fd93d6..0355388bf 100644
--- a/targets/minecraft/world/level/tile/ChestTile.cpp
+++ b/targets/minecraft/world/level/tile/ChestTile.cpp
@@ -1,15 +1,16 @@
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
 #include "ChestTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/animal/net.minecraft.world.entity.animal.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
 
 ChestTile::ChestTile(int id, int type)
     : BaseEntityTile(id, Material::wood, false) {
diff --git a/targets/minecraft/world/level/tile/ClayTile.cpp b/targets/minecraft/world/level/tile/ClayTile.cpp
index 760be076d..1800fff90 100644
--- a/targets/minecraft/world/level/tile/ClayTile.cpp
+++ b/targets/minecraft/world/level/tile/ClayTile.cpp
@@ -1,4 +1,5 @@
 #include "ClayTile.h"
+
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/CocoaTile.cpp b/targets/minecraft/world/level/tile/CocoaTile.cpp
index 823b75456..e776eb490 100644
--- a/targets/minecraft/world/level/tile/CocoaTile.cpp
+++ b/targets/minecraft/world/level/tile/CocoaTile.cpp
@@ -1,6 +1,7 @@
+#include "CocoaTile.h"
+
 #include <optional>
 
-#include "CocoaTile.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/world/level/tile/ColoredTile.cpp b/targets/minecraft/world/level/tile/ColoredTile.cpp
index d1ad65e2f..cceb3e2f8 100644
--- a/targets/minecraft/world/level/tile/ColoredTile.cpp
+++ b/targets/minecraft/world/level/tile/ColoredTile.cpp
@@ -1,6 +1,7 @@
+#include "ColoredTile.h"
+
 #include <string>
 
-#include "ColoredTile.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/CommandBlock.cpp b/targets/minecraft/world/level/tile/CommandBlock.cpp
index 9e8d40d42..3cd36a94a 100644
--- a/targets/minecraft/world/level/tile/CommandBlock.cpp
+++ b/targets/minecraft/world/level/tile/CommandBlock.cpp
@@ -1,7 +1,8 @@
+#include "CommandBlock.h"
+
 #include <memory>
 #include <string>
 
-#include "CommandBlock.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/ComparatorTile.cpp b/targets/minecraft/world/level/tile/ComparatorTile.cpp
index bbc9487c3..8a520eabe 100644
--- a/targets/minecraft/world/level/tile/ComparatorTile.cpp
+++ b/targets/minecraft/world/level/tile/ComparatorTile.cpp
@@ -1,9 +1,10 @@
+#include "ComparatorTile.h"
+
 #include <algorithm>
 
-#include "ComparatorTile.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/CoralTile.cpp b/targets/minecraft/world/level/tile/CoralTile.cpp
index 44810ad31..a189d020c 100644
--- a/targets/minecraft/world/level/tile/CoralTile.cpp
+++ b/targets/minecraft/world/level/tile/CoralTile.cpp
@@ -1,6 +1,7 @@
+#include "CoralTile.h"
+
 #include <string>
 
-#include "CoralTile.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/HalfTransparentTile.h"
 
diff --git a/targets/minecraft/world/level/tile/CropTile.cpp b/targets/minecraft/world/level/tile/CropTile.cpp
index 59035ec95..b101c1050 100644
--- a/targets/minecraft/world/level/tile/CropTile.cpp
+++ b/targets/minecraft/world/level/tile/CropTile.cpp
@@ -1,7 +1,8 @@
+#include "CropTile.h"
+
 #include <memory>
 #include <string>
 
-#include "CropTile.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp
index f3152295a..52e2d2b33 100644
--- a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp
+++ b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp
@@ -1,9 +1,11 @@
+#include "DaylightDetectorTile.h"
+
 #include <math.h>
+
 #include <numbers>
 #include <string>
 
 #include "java/JavaMath.h"
-#include "DaylightDetectorTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/DeadBushTile.cpp b/targets/minecraft/world/level/tile/DeadBushTile.cpp
index 8631d5ffb..b0f12c3e9 100644
--- a/targets/minecraft/world/level/tile/DeadBushTile.cpp
+++ b/targets/minecraft/world/level/tile/DeadBushTile.cpp
@@ -1,6 +1,7 @@
+#include "DeadBushTile.h"
+
 #include <memory>
 
-#include "DeadBushTile.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/level/tile/DetectorRailTile.cpp b/targets/minecraft/world/level/tile/DetectorRailTile.cpp
index 4e34e5cd7..867a8efc5 100644
--- a/targets/minecraft/world/level/tile/DetectorRailTile.cpp
+++ b/targets/minecraft/world/level/tile/DetectorRailTile.cpp
@@ -1,9 +1,10 @@
+#include "DetectorRailTile.h"
+
 #include <format>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "DetectorRailTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/DiodeTile.cpp b/targets/minecraft/world/level/tile/DiodeTile.cpp
index e5244df95..a54173367 100644
--- a/targets/minecraft/world/level/tile/DiodeTile.cpp
+++ b/targets/minecraft/world/level/tile/DiodeTile.cpp
@@ -1,7 +1,8 @@
+#include "DiodeTile.h"
+
 #include <algorithm>
 #include <memory>
 
-#include "DiodeTile.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/level/tile/DirectionalTile.cpp b/targets/minecraft/world/level/tile/DirectionalTile.cpp
index 29f1f2ad0..59c6ba67d 100644
--- a/targets/minecraft/world/level/tile/DirectionalTile.cpp
+++ b/targets/minecraft/world/level/tile/DirectionalTile.cpp
@@ -1,4 +1,5 @@
 #include "DirectionalTile.h"
+
 #include "minecraft/world/level/tile/Tile.h"
 
 class Material;
diff --git a/targets/minecraft/world/level/tile/DirtTile.cpp b/targets/minecraft/world/level/tile/DirtTile.cpp
index 8a7d2942a..57f298790 100644
--- a/targets/minecraft/world/level/tile/DirtTile.cpp
+++ b/targets/minecraft/world/level/tile/DirtTile.cpp
@@ -1,4 +1,5 @@
 #include "DirtTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/DispenserTile.cpp b/targets/minecraft/world/level/tile/DispenserTile.cpp
index 9ab0445cc..5fdf064b3 100644
--- a/targets/minecraft/world/level/tile/DispenserTile.cpp
+++ b/targets/minecraft/world/level/tile/DispenserTile.cpp
@@ -1,8 +1,8 @@
+#include "DispenserTile.h"
+
 #include <string>
 
-#include "DispenserTile.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Facing.h"
 #include "minecraft/core/BehaviorRegistry.h"
 #include "minecraft/core/BlockSource.h"
@@ -24,6 +24,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
+#include "nbt/CompoundTag.h"
 
 class Position;
 
diff --git a/targets/minecraft/world/level/tile/DoorTile.cpp b/targets/minecraft/world/level/tile/DoorTile.cpp
index f0e797874..a06bd5647 100644
--- a/targets/minecraft/world/level/tile/DoorTile.cpp
+++ b/targets/minecraft/world/level/tile/DoorTile.cpp
@@ -1,6 +1,7 @@
+#include "DoorTile.h"
+
 #include <optional>
 
-#include "DoorTile.h"
 #include "LevelEvent.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/FlippedIcon.h"
diff --git a/targets/minecraft/world/level/tile/DropperTile.cpp b/targets/minecraft/world/level/tile/DropperTile.cpp
index ddfaa0531..2a11a1fb8 100644
--- a/targets/minecraft/world/level/tile/DropperTile.cpp
+++ b/targets/minecraft/world/level/tile/DropperTile.cpp
@@ -1,7 +1,8 @@
+#include "DropperTile.h"
+
 #include <memory>
 #include <string>
 
-#include "DropperTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/core/BlockSourceImpl.h"
 #include "minecraft/core/DefaultDispenseItemBehavior.h"
diff --git a/targets/minecraft/world/level/tile/EggTile.cpp b/targets/minecraft/world/level/tile/EggTile.cpp
index e3e47289f..e10e15044 100644
--- a/targets/minecraft/world/level/tile/EggTile.cpp
+++ b/targets/minecraft/world/level/tile/EggTile.cpp
@@ -1,8 +1,9 @@
+#include "EggTile.h"
+
 #include <memory>
 
-#include "EggTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/entity/item/FallingTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp
index 0e9b4deba..9586676a3 100644
--- a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp
+++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp
@@ -1,10 +1,10 @@
+#include "EnchantmentTableTile.h"
+
 #include <memory>
 
-#include "EnchantmentTableTile.h"
-#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/ItemInstance.h"
@@ -12,6 +12,7 @@
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/BaseEntityTile.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h"
 
 const std::wstring EnchantmentTableTile::TEXTURE_SIDE = L"enchantment_side";
 const std::wstring EnchantmentTableTile::TEXTURE_TOP = L"enchantment_top";
diff --git a/targets/minecraft/world/level/tile/EnderChestTile.cpp b/targets/minecraft/world/level/tile/EnderChestTile.cpp
index 188c083fe..4796748a5 100644
--- a/targets/minecraft/world/level/tile/EnderChestTile.cpp
+++ b/targets/minecraft/world/level/tile/EnderChestTile.cpp
@@ -1,10 +1,11 @@
+#include "EnderChestTile.h"
+
 #include <memory>
 #include <string>
 
-#include "EnderChestTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/level/tile/FarmTile.cpp b/targets/minecraft/world/level/tile/FarmTile.cpp
index c6fc39ecf..f7329cd0b 100644
--- a/targets/minecraft/world/level/tile/FarmTile.cpp
+++ b/targets/minecraft/world/level/tile/FarmTile.cpp
@@ -1,8 +1,9 @@
+#include "FarmTile.h"
+
 #include <memory>
 #include <optional>
 #include <string>
 
-#include "FarmTile.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/world/level/tile/FenceGateTile.cpp b/targets/minecraft/world/level/tile/FenceGateTile.cpp
index 74ee50b6a..0d5fc072c 100644
--- a/targets/minecraft/world/level/tile/FenceGateTile.cpp
+++ b/targets/minecraft/world/level/tile/FenceGateTile.cpp
@@ -1,6 +1,7 @@
+#include "FenceGateTile.h"
+
 #include <optional>
 
-#include "FenceGateTile.h"
 #include "LevelEvent.h"
 #include "minecraft/Direction.h"
 #include "minecraft/util/Mth.h"
diff --git a/targets/minecraft/world/level/tile/FenceTile.cpp b/targets/minecraft/world/level/tile/FenceTile.cpp
index 37aef1308..ae181dbcc 100644
--- a/targets/minecraft/world/level/tile/FenceTile.cpp
+++ b/targets/minecraft/world/level/tile/FenceTile.cpp
@@ -1,4 +1,5 @@
 #include "FenceTile.h"
+
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/LeashItem.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp
index 8115b927b..ef7458db6 100644
--- a/targets/minecraft/world/level/tile/FireTile.cpp
+++ b/targets/minecraft/world/level/tile/FireTile.cpp
@@ -1,14 +1,16 @@
+#include "FireTile.h"
+
 #include <string.h>
+
 #include <optional>
 
-#include "FireTile.h"
-#include "minecraft/server/MinecraftServer.h"
-#include "minecraft/server/PlayerList.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/server/MinecraftServer.h"
+#include "minecraft/server/PlayerList.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/GameRules.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/FlowerPotTile.cpp b/targets/minecraft/world/level/tile/FlowerPotTile.cpp
index 74774ff96..f741f73d1 100644
--- a/targets/minecraft/world/level/tile/FlowerPotTile.cpp
+++ b/targets/minecraft/world/level/tile/FlowerPotTile.cpp
@@ -1,4 +1,5 @@
 #include "FlowerPotTile.h"
+
 #include "minecraft/world/entity/player/Abilities.h"
 #include "minecraft/world/entity/player/Inventory.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/level/tile/FurnaceTile.cpp b/targets/minecraft/world/level/tile/FurnaceTile.cpp
index 2e464c5a9..e27218efe 100644
--- a/targets/minecraft/world/level/tile/FurnaceTile.cpp
+++ b/targets/minecraft/world/level/tile/FurnaceTile.cpp
@@ -1,13 +1,14 @@
+#include "FurnaceTile.h"
+
 #include <stdio.h>
+
 #include <memory>
 #include <string>
 
 #include "FurnaceTile.h"
-#include "minecraft/Facing.h"
-#include "FurnaceTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
+#include "minecraft/Facing.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/IconRegister.h"
@@ -22,6 +23,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 bool FurnaceTile::noDrop = false;
 
diff --git a/targets/minecraft/world/level/tile/GlassTile.cpp b/targets/minecraft/world/level/tile/GlassTile.cpp
index a56ed490f..b6cd32201 100644
--- a/targets/minecraft/world/level/tile/GlassTile.cpp
+++ b/targets/minecraft/world/level/tile/GlassTile.cpp
@@ -1,6 +1,7 @@
+#include "GlassTile.h"
+
 #include <string>
 
-#include "GlassTile.h"
 #include "minecraft/world/level/tile/HalfTransparentTile.h"
 
 class Material;
diff --git a/targets/minecraft/world/level/tile/GlowstoneTile.cpp b/targets/minecraft/world/level/tile/GlowstoneTile.cpp
index 726ef815a..1d27e1e66 100644
--- a/targets/minecraft/world/level/tile/GlowstoneTile.cpp
+++ b/targets/minecraft/world/level/tile/GlowstoneTile.cpp
@@ -1,4 +1,5 @@
 #include "GlowstoneTile.h"
+
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp
index 9383daeb9..7875d0f60 100644
--- a/targets/minecraft/world/level/tile/GrassTile.cpp
+++ b/targets/minecraft/world/level/tile/GrassTile.cpp
@@ -1,11 +1,12 @@
+#include "GrassTile.h"
+
 #include <string>
 
-#include "minecraft/client/Minecraft.h"
-#include "GrassTile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/GravelTile.cpp b/targets/minecraft/world/level/tile/GravelTile.cpp
index 84dbf1df5..46b6043b2 100644
--- a/targets/minecraft/world/level/tile/GravelTile.cpp
+++ b/targets/minecraft/world/level/tile/GravelTile.cpp
@@ -1,4 +1,5 @@
 #include "GravelTile.h"
+
 #include "java/Random.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/tile/HeavyTile.h"
diff --git a/targets/minecraft/world/level/tile/HalfSlabTile.cpp b/targets/minecraft/world/level/tile/HalfSlabTile.cpp
index 2ac53c616..b06b6c59d 100644
--- a/targets/minecraft/world/level/tile/HalfSlabTile.cpp
+++ b/targets/minecraft/world/level/tile/HalfSlabTile.cpp
@@ -1,4 +1,5 @@
 #include "HalfSlabTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/HalfTransparentTile.cpp b/targets/minecraft/world/level/tile/HalfTransparentTile.cpp
index d4439a2da..d17ac98b6 100644
--- a/targets/minecraft/world/level/tile/HalfTransparentTile.cpp
+++ b/targets/minecraft/world/level/tile/HalfTransparentTile.cpp
@@ -1,4 +1,5 @@
 #include "HalfTransparentTile.h"
+
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/HayBlockTile.cpp b/targets/minecraft/world/level/tile/HayBlockTile.cpp
index e1dddec0a..5401ede41 100644
--- a/targets/minecraft/world/level/tile/HayBlockTile.cpp
+++ b/targets/minecraft/world/level/tile/HayBlockTile.cpp
@@ -1,6 +1,7 @@
+#include "HayBlockTile.h"
+
 #include <string>
 
-#include "HayBlockTile.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/RotatedPillarTile.h"
diff --git a/targets/minecraft/world/level/tile/HeavyTile.cpp b/targets/minecraft/world/level/tile/HeavyTile.cpp
index 83714c7f0..d301708a1 100644
--- a/targets/minecraft/world/level/tile/HeavyTile.cpp
+++ b/targets/minecraft/world/level/tile/HeavyTile.cpp
@@ -1,4 +1,5 @@
 #include "HeavyTile.h"
+
 #include "minecraft/world/entity/item/FallingTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/HopperTile.cpp b/targets/minecraft/world/level/tile/HopperTile.cpp
index b8a8e7f35..136a22e23 100644
--- a/targets/minecraft/world/level/tile/HopperTile.cpp
+++ b/targets/minecraft/world/level/tile/HopperTile.cpp
@@ -1,5 +1,5 @@
 #include "HopperTile.h"
-#include "nbt/CompoundTag.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/Container.h"
 #include "minecraft/world/IconRegister.h"
@@ -13,6 +13,7 @@
 #include "minecraft/world/level/tile/BaseEntityTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/HopperTileEntity.h"
+#include "nbt/CompoundTag.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp
index 4e15fc404..5051008e2 100644
--- a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp
+++ b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp
@@ -1,4 +1,5 @@
 #include "HugeMushroomTile.h"
+
 #include "java/Random.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/IceTile.cpp b/targets/minecraft/world/level/tile/IceTile.cpp
index 9b07a37eb..0f84094e1 100644
--- a/targets/minecraft/world/level/tile/IceTile.cpp
+++ b/targets/minecraft/world/level/tile/IceTile.cpp
@@ -1,7 +1,8 @@
+#include "IceTile.h"
+
 #include <memory>
 #include <string>
 
-#include "IceTile.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/food/FoodConstants.h"
diff --git a/targets/minecraft/world/level/tile/JukeboxTile.cpp b/targets/minecraft/world/level/tile/JukeboxTile.cpp
index c39af5c9c..a0f7b99a2 100644
--- a/targets/minecraft/world/level/tile/JukeboxTile.cpp
+++ b/targets/minecraft/world/level/tile/JukeboxTile.cpp
@@ -1,9 +1,9 @@
+#include "JukeboxTile.h"
+
 #include <string>
 
-#include "JukeboxTile.h"
 #include "LevelEvent.h"
 #include "java/Random.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/item/ItemEntity.h"
@@ -14,6 +14,7 @@
 #include "minecraft/world/level/tile/BaseEntityTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 JukeboxTile::Entity::Entity() : TileEntity() { record = nullptr; }
 
diff --git a/targets/minecraft/world/level/tile/JukeboxTile.h b/targets/minecraft/world/level/tile/JukeboxTile.h
index 902a77d45..2c92dc2dc 100644
--- a/targets/minecraft/world/level/tile/JukeboxTile.h
+++ b/targets/minecraft/world/level/tile/JukeboxTile.h
@@ -3,10 +3,10 @@
 #include <memory>
 
 #include "BaseEntityTile.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "java/Class.h"
 #include "minecraft/world/item/ItemInstance.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 class CompoundTag;
 class ChunkRebuildData;
diff --git a/targets/minecraft/world/level/tile/LadderTile.cpp b/targets/minecraft/world/level/tile/LadderTile.cpp
index 5b184ae13..0e06770ff 100644
--- a/targets/minecraft/world/level/tile/LadderTile.cpp
+++ b/targets/minecraft/world/level/tile/LadderTile.cpp
@@ -1,6 +1,7 @@
+#include "LadderTile.h"
+
 #include <optional>
 
-#include "LadderTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp
index 7dec96993..65565df09 100644
--- a/targets/minecraft/world/level/tile/LeafTile.cpp
+++ b/targets/minecraft/world/level/tile/LeafTile.cpp
@@ -1,12 +1,12 @@
-#include "minecraft/client/Minecraft.h"
 #include "LeafTile.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "strings.h"
 
 const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/LeverTile.cpp b/targets/minecraft/world/level/tile/LeverTile.cpp
index 3b1748314..bd79e322b 100644
--- a/targets/minecraft/world/level/tile/LeverTile.cpp
+++ b/targets/minecraft/world/level/tile/LeverTile.cpp
@@ -1,8 +1,9 @@
+#include "LeverTile.h"
+
 #include <optional>
 
-#include "LeverTile.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/LiquidTile.cpp b/targets/minecraft/world/level/tile/LiquidTile.cpp
index 5b9fea5d8..76c50a4f3 100644
--- a/targets/minecraft/world/level/tile/LiquidTile.cpp
+++ b/targets/minecraft/world/level/tile/LiquidTile.cpp
@@ -1,20 +1,22 @@
+#include "LiquidTile.h"
+
 #include <math.h>
+
 #include <memory>
 #include <numbers>
 #include <optional>
 
 #include "java/JavaMath.h"
-#include "LiquidTile.h"
+#include "java/Random.h"
 #include "minecraft/Facing.h"
-#include "minecraft/world/level/material/Material.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/dimension/Dimension.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 
diff --git a/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp b/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp
index dd0476f71..eacf71865 100644
--- a/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp
+++ b/targets/minecraft/world/level/tile/LiquidTileDynamic.cpp
@@ -1,4 +1,5 @@
 #include "LiquidTileDynamic.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
diff --git a/targets/minecraft/world/level/tile/LiquidTileStatic.cpp b/targets/minecraft/world/level/tile/LiquidTileStatic.cpp
index 9fc408391..6e32620c8 100644
--- a/targets/minecraft/world/level/tile/LiquidTileStatic.cpp
+++ b/targets/minecraft/world/level/tile/LiquidTileStatic.cpp
@@ -1,4 +1,5 @@
 #include "LiquidTileStatic.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/LockedChestTile.cpp b/targets/minecraft/world/level/tile/LockedChestTile.cpp
index 1a46ea9e7..57fef8160 100644
--- a/targets/minecraft/world/level/tile/LockedChestTile.cpp
+++ b/targets/minecraft/world/level/tile/LockedChestTile.cpp
@@ -1,4 +1,5 @@
 #include "LockedChestTile.h"
+
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/MelonTile.cpp b/targets/minecraft/world/level/tile/MelonTile.cpp
index 6d42a53b6..2f8a1a3ae 100644
--- a/targets/minecraft/world/level/tile/MelonTile.cpp
+++ b/targets/minecraft/world/level/tile/MelonTile.cpp
@@ -1,8 +1,9 @@
+#include "MelonTile.h"
+
 #include <string>
 
-#include "MelonTile.h"
-#include "minecraft/Facing.h"
 #include "java/Random.h"
+#include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/MetalTile.cpp b/targets/minecraft/world/level/tile/MetalTile.cpp
index 109989882..e1c97e9a5 100644
--- a/targets/minecraft/world/level/tile/MetalTile.cpp
+++ b/targets/minecraft/world/level/tile/MetalTile.cpp
@@ -1,4 +1,5 @@
 #include "MetalTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp
index 2c3b713f0..5db7e5482 100644
--- a/targets/minecraft/world/level/tile/MobSpawnerTile.cpp
+++ b/targets/minecraft/world/level/tile/MobSpawnerTile.cpp
@@ -1,6 +1,7 @@
+#include "MobSpawnerTile.h"
+
 #include <memory>
 
-#include "MobSpawnerTile.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/MushroomPlantTile.cpp b/targets/minecraft/world/level/tile/MushroomPlantTile.cpp
index 6a75e1e00..e552b674a 100644
--- a/targets/minecraft/world/level/tile/MushroomPlantTile.cpp
+++ b/targets/minecraft/world/level/tile/MushroomPlantTile.cpp
@@ -1,4 +1,5 @@
 #include "MushroomPlantTile.h"
+
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
diff --git a/targets/minecraft/world/level/tile/MycelTile.cpp b/targets/minecraft/world/level/tile/MycelTile.cpp
index 1acd4125a..50183e604 100644
--- a/targets/minecraft/world/level/tile/MycelTile.cpp
+++ b/targets/minecraft/world/level/tile/MycelTile.cpp
@@ -1,9 +1,10 @@
+#include "MycelTile.h"
+
 #include <string>
 
-#include "MycelTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/NetherWartTile.cpp b/targets/minecraft/world/level/tile/NetherWartTile.cpp
index ca0463380..17bd7ab8e 100644
--- a/targets/minecraft/world/level/tile/NetherWartTile.cpp
+++ b/targets/minecraft/world/level/tile/NetherWartTile.cpp
@@ -1,7 +1,8 @@
+#include "NetherWartTile.h"
+
 #include <memory>
 #include <string>
 
-#include "NetherWartTile.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/NetherrackTile.cpp b/targets/minecraft/world/level/tile/NetherrackTile.cpp
index a0f333f0d..8aea08779 100644
--- a/targets/minecraft/world/level/tile/NetherrackTile.cpp
+++ b/targets/minecraft/world/level/tile/NetherrackTile.cpp
@@ -1,4 +1,5 @@
 #include "NetherrackTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/NotGateTile.cpp b/targets/minecraft/world/level/tile/NotGateTile.cpp
index c6059b964..5e57d939a 100644
--- a/targets/minecraft/world/level/tile/NotGateTile.cpp
+++ b/targets/minecraft/world/level/tile/NotGateTile.cpp
@@ -1,8 +1,9 @@
 #include "NotGateTile.h"
+
 #include "Minecraft.Client/Linux/Linux_App.h"
+#include "java/Random.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/redstone/Redstone.h"
diff --git a/targets/minecraft/world/level/tile/NotGateTile.h b/targets/minecraft/world/level/tile/NotGateTile.h
index 05bc54d0f..0d7da17e3 100644
--- a/targets/minecraft/world/level/tile/NotGateTile.h
+++ b/targets/minecraft/world/level/tile/NotGateTile.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+
 #include <deque>
 #include <unordered_map>
 
diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp
index 40cc668f2..28080a059 100644
--- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp
+++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp
@@ -1,7 +1,8 @@
+#include "NoteBlockTile.h"
+
 #include <cmath>
 #include <memory>
 
-#include "NoteBlockTile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/sounds/SoundTypes.h"
diff --git a/targets/minecraft/world/level/tile/ObsidianTile.cpp b/targets/minecraft/world/level/tile/ObsidianTile.cpp
index 847960f96..56d069eb2 100644
--- a/targets/minecraft/world/level/tile/ObsidianTile.cpp
+++ b/targets/minecraft/world/level/tile/ObsidianTile.cpp
@@ -1,4 +1,5 @@
 #include "ObsidianTile.h"
+
 #include "minecraft/world/level/tile/StoneTile.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/OreTile.cpp b/targets/minecraft/world/level/tile/OreTile.cpp
index b9b395771..f09417c11 100644
--- a/targets/minecraft/world/level/tile/OreTile.cpp
+++ b/targets/minecraft/world/level/tile/OreTile.cpp
@@ -1,4 +1,5 @@
 #include "OreTile.h"
+
 #include "java/Random.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/level/tile/PlantTile.cpp b/targets/minecraft/world/level/tile/PlantTile.cpp
index de3877886..dbe43684e 100644
--- a/targets/minecraft/world/level/tile/PlantTile.cpp
+++ b/targets/minecraft/world/level/tile/PlantTile.cpp
@@ -1,6 +1,7 @@
+#include "PlantTile.h"
+
 #include <optional>
 
-#include "PlantTile.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/PlantTile.h b/targets/minecraft/world/level/tile/PlantTile.h
index efe0e36e6..d23e1c09a 100644
--- a/targets/minecraft/world/level/tile/PlantTile.h
+++ b/targets/minecraft/world/level/tile/PlantTile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Tile.h"
-#include "minecraft/world/level/material/Material.h"
 #include "console_helpers/Definitions.h"
+#include "minecraft/world/level/material/Material.h"
 
 class Random;
 class Level;
diff --git a/targets/minecraft/world/level/tile/PortalTile.cpp b/targets/minecraft/world/level/tile/PortalTile.cpp
index ff4a0bb97..444eeca43 100644
--- a/targets/minecraft/world/level/tile/PortalTile.cpp
+++ b/targets/minecraft/world/level/tile/PortalTile.cpp
@@ -1,11 +1,12 @@
+#include "PortalTile.h"
+
 #include <optional>
 #include <string>
 
-#include "PortalTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/item/SpawnEggItem.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/PortalTile.h b/targets/minecraft/world/level/tile/PortalTile.h
index 8e88240ef..bd4448a85 100644
--- a/targets/minecraft/world/level/tile/PortalTile.h
+++ b/targets/minecraft/world/level/tile/PortalTile.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <optional>
 #include <memory>
+#include <optional>
 
 #include "HalfTransparentTile.h"
 #include "console_helpers/Definitions.h"
diff --git a/targets/minecraft/world/level/tile/PotatoTile.cpp b/targets/minecraft/world/level/tile/PotatoTile.cpp
index 0b75fe830..61dc02fe0 100644
--- a/targets/minecraft/world/level/tile/PotatoTile.cpp
+++ b/targets/minecraft/world/level/tile/PotatoTile.cpp
@@ -1,7 +1,8 @@
+#include "PotatoTile.h"
+
 #include <memory>
 #include <string>
 
-#include "PotatoTile.h"
 #include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/PoweredMetalTile.cpp b/targets/minecraft/world/level/tile/PoweredMetalTile.cpp
index 0949fb485..137e46760 100644
--- a/targets/minecraft/world/level/tile/PoweredMetalTile.cpp
+++ b/targets/minecraft/world/level/tile/PoweredMetalTile.cpp
@@ -1,4 +1,5 @@
 #include "PoweredMetalTile.h"
+
 #include "minecraft/world/level/redstone/Redstone.h"
 #include "minecraft/world/level/tile/MetalTile.h"
 
diff --git a/targets/minecraft/world/level/tile/PoweredRailTile.cpp b/targets/minecraft/world/level/tile/PoweredRailTile.cpp
index 971d69dd8..b52191233 100644
--- a/targets/minecraft/world/level/tile/PoweredRailTile.cpp
+++ b/targets/minecraft/world/level/tile/PoweredRailTile.cpp
@@ -1,6 +1,7 @@
+#include "PoweredRailTile.h"
+
 #include <string>
 
-#include "PoweredRailTile.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/BaseRailTile.h"
diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.cpp b/targets/minecraft/world/level/tile/PressurePlateTile.cpp
index 0df136400..aed019d14 100644
--- a/targets/minecraft/world/level/tile/PressurePlateTile.cpp
+++ b/targets/minecraft/world/level/tile/PressurePlateTile.cpp
@@ -1,8 +1,9 @@
+#include "PressurePlateTile.h"
+
 #include <format>
 #include <memory>
 #include <vector>
 
-#include "PressurePlateTile.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/level/tile/PumpkinTile.cpp b/targets/minecraft/world/level/tile/PumpkinTile.cpp
index 077f84a38..4c994166a 100644
--- a/targets/minecraft/world/level/tile/PumpkinTile.cpp
+++ b/targets/minecraft/world/level/tile/PumpkinTile.cpp
@@ -1,14 +1,15 @@
+#include "PumpkinTile.h"
+
 #include <memory>
 
-#include "PumpkinTile.h"
-#include "minecraft/world/entity/animal/SnowMan.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/LivingEntity.h"
+#include "minecraft/world/entity/animal/SnowMan.h"
 #include "minecraft/world/entity/animal/VillagerGolem.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp
index 793c103ce..633cdcccf 100644
--- a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp
+++ b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp
@@ -1,11 +1,12 @@
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "QuartzBlockTile.h"
 
+#include "minecraft/net.minecraft.h"
+#include "minecraft/world/net.minecraft.world.h"
+
 // 4J Added
+#include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/piston/PistonBaseTile.h"
-#include "minecraft/world/entity/player/Player.h"
 
 int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = {
     IDS_TILE_QUARTZ_BLOCK, IDS_TILE_QUARTZ_BLOCK_CHISELED,
diff --git a/targets/minecraft/world/level/tile/RailTile.cpp b/targets/minecraft/world/level/tile/RailTile.cpp
index a03b2d799..d9d2a45ba 100644
--- a/targets/minecraft/world/level/tile/RailTile.cpp
+++ b/targets/minecraft/world/level/tile/RailTile.cpp
@@ -1,6 +1,7 @@
+#include "RailTile.h"
+
 #include <string>
 
-#include "RailTile.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/tile/BaseRailTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp
index 385a45a16..4f70918e1 100644
--- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp
+++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp
@@ -1,16 +1,18 @@
+#include "RedStoneDustTile.h"
+
 #include <stdint.h>
+
 #include <optional>
 #include <vector>
 
-#include "minecraft/client/Minecraft.h"
-#include "RedStoneDustTile.h"
-#include "minecraft/Direction.h"
 #include "DiodeTile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
+#include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/RedStoneOreTile.cpp b/targets/minecraft/world/level/tile/RedStoneOreTile.cpp
index 5b111b698..9027c9a0a 100644
--- a/targets/minecraft/world/level/tile/RedStoneOreTile.cpp
+++ b/targets/minecraft/world/level/tile/RedStoneOreTile.cpp
@@ -1,8 +1,9 @@
+#include "RedStoneOreTile.h"
+
 #include <memory>
 
-#include "RedStoneOreTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/RedlightTile.cpp b/targets/minecraft/world/level/tile/RedlightTile.cpp
index 3727fc289..300b14cd6 100644
--- a/targets/minecraft/world/level/tile/RedlightTile.cpp
+++ b/targets/minecraft/world/level/tile/RedlightTile.cpp
@@ -1,6 +1,7 @@
+#include "RedlightTile.h"
+
 #include <string>
 
-#include "RedlightTile.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/ReedTile.cpp b/targets/minecraft/world/level/tile/ReedTile.cpp
index 1ffa1dd55..4cc317f3f 100644
--- a/targets/minecraft/world/level/tile/ReedTile.cpp
+++ b/targets/minecraft/world/level/tile/ReedTile.cpp
@@ -1,6 +1,7 @@
+#include "ReedTile.h"
+
 #include <optional>
 
-#include "ReedTile.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/RepeaterTile.cpp b/targets/minecraft/world/level/tile/RepeaterTile.cpp
index 1c8b1c9b9..0acd4e3c4 100644
--- a/targets/minecraft/world/level/tile/RepeaterTile.cpp
+++ b/targets/minecraft/world/level/tile/RepeaterTile.cpp
@@ -1,9 +1,10 @@
+#include "RepeaterTile.h"
+
 #include <memory>
 
-#include "RepeaterTile.h"
-#include "minecraft/core/particles/ParticleTypes.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/redstone/Redstone.h"
diff --git a/targets/minecraft/world/level/tile/RotatedPillarTile.cpp b/targets/minecraft/world/level/tile/RotatedPillarTile.cpp
index 36928c952..edab87c24 100644
--- a/targets/minecraft/world/level/tile/RotatedPillarTile.cpp
+++ b/targets/minecraft/world/level/tile/RotatedPillarTile.cpp
@@ -1,6 +1,7 @@
+#include "RotatedPillarTile.h"
+
 #include <memory>
 
-#include "RotatedPillarTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/SandStoneTile.cpp b/targets/minecraft/world/level/tile/SandStoneTile.cpp
index d9802e15c..eb84222ed 100644
--- a/targets/minecraft/world/level/tile/SandStoneTile.cpp
+++ b/targets/minecraft/world/level/tile/SandStoneTile.cpp
@@ -1,8 +1,8 @@
+#include "SandStoneTile.h"
+
 #include "minecraft/net.minecraft.h"
 #include "minecraft/world/level/material/net.minecraft.world.level.material.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "SandStoneTile.h"
-
 #include "strings.h"
 
 const std::wstring SandStoneTile::TEXTURE_TOP = L"sandstone_top";
diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp
index 44bb9afd4..028b229fc 100644
--- a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp
+++ b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp
@@ -1,10 +1,9 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h"
-#include "minecraft/world/net.minecraft.world.h"
-
 #include "SaplingPlantTile.h"
 
+#include "minecraft/world/level/levelgen/feature/net.minecraft.world.level.levelgen.feature.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "net.minecraft.world.level.tile.h"
 #include "strings.h"
 
 int Sapling::SAPLING_NAMES[SAPLING_NAMES_SIZE] = {
diff --git a/targets/minecraft/world/level/tile/SignTile.cpp b/targets/minecraft/world/level/tile/SignTile.cpp
index 96436e9cf..90c81a4a4 100644
--- a/targets/minecraft/world/level/tile/SignTile.cpp
+++ b/targets/minecraft/world/level/tile/SignTile.cpp
@@ -1,13 +1,14 @@
+#include "SignTile.h"
+
 #include <optional>
 
-#include "minecraft/world/level/material/Material.h"
-#include "minecraft/world/level/tile/entity/SignTileEntity.h"
-#include "SignTile.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/BaseEntityTile.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/phys/AABB.h"
 
 SignTile::SignTile(int id, eINSTANCEOF clas, bool onGround)
diff --git a/targets/minecraft/world/level/tile/SignTile.h b/targets/minecraft/world/level/tile/SignTile.h
index 3320509ae..d5bf12f45 100644
--- a/targets/minecraft/world/level/tile/SignTile.h
+++ b/targets/minecraft/world/level/tile/SignTile.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <optional>
 #include <memory>
+#include <optional>
 
 #include "BaseEntityTile.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
-#include "minecraft/world/level/material/Material.h"
 #include "java/Class.h"
+#include "minecraft/world/level/material/Material.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
 
 class SignTile : public BaseEntityTile {
     friend class Tile;
diff --git a/targets/minecraft/world/level/tile/SkullTile.cpp b/targets/minecraft/world/level/tile/SkullTile.cpp
index 7713b093e..80f6da459 100644
--- a/targets/minecraft/world/level/tile/SkullTile.cpp
+++ b/targets/minecraft/world/level/tile/SkullTile.cpp
@@ -1,13 +1,14 @@
-#include "minecraft/world/net.minecraft.world.h"
+#include "SkullTile.h"
+
+#include "console_helpers/StringHelpers.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/util/Mth.h"
+#include "minecraft/world/entity/boss/wither/WitherBoss.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/entity/boss/wither/WitherBoss.h"
-#include "minecraft/net.minecraft.h"
-#include "SkullTile.h"
-#include "console_helpers/StringHelpers.h"
-#include "minecraft/util/Mth.h"
+#include "minecraft/world/net.minecraft.world.h"
 
 SkullTile::SkullTile(int id) : BaseEntityTile(id, Material::decoration, false) {
     setShape(4.0f / 16.0f, 0, 4.0f / 16.0f, 12.0f / 16.0f, .5f, 12.0f / 16.0f);
diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp
index f0f3a62b6..1410d61f2 100644
--- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp
+++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp
@@ -1,6 +1,6 @@
 #include "SmoothStoneBrickTile.h"
-#include "minecraft/world/net.minecraft.world.h"
 
+#include "minecraft/world/net.minecraft.world.h"
 #include "strings.h"
 
 const std::wstring SmoothStoneBrickTile::TEXTURE_NAMES[] = {
diff --git a/targets/minecraft/world/level/tile/SnowTile.cpp b/targets/minecraft/world/level/tile/SnowTile.cpp
index dff1c418c..5dec764bb 100644
--- a/targets/minecraft/world/level/tile/SnowTile.cpp
+++ b/targets/minecraft/world/level/tile/SnowTile.cpp
@@ -1,4 +1,5 @@
 #include "SnowTile.h"
+
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LightLayer.h"
diff --git a/targets/minecraft/world/level/tile/SoulSandTile.cpp b/targets/minecraft/world/level/tile/SoulSandTile.cpp
index ed6cf51f9..46bebd72c 100644
--- a/targets/minecraft/world/level/tile/SoulSandTile.cpp
+++ b/targets/minecraft/world/level/tile/SoulSandTile.cpp
@@ -1,7 +1,8 @@
+#include "SoulSandTile.h"
+
 #include <memory>
 #include <optional>
 
-#include "SoulSandTile.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/SpongeTile.cpp b/targets/minecraft/world/level/tile/SpongeTile.cpp
index e44525e72..644b227fb 100644
--- a/targets/minecraft/world/level/tile/SpongeTile.cpp
+++ b/targets/minecraft/world/level/tile/SpongeTile.cpp
@@ -1,4 +1,5 @@
 #include "SpongeTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/StainedGlassBlock.cpp b/targets/minecraft/world/level/tile/StainedGlassBlock.cpp
index bcc8e216a..d87852dc7 100644
--- a/targets/minecraft/world/level/tile/StainedGlassBlock.cpp
+++ b/targets/minecraft/world/level/tile/StainedGlassBlock.cpp
@@ -1,6 +1,7 @@
+#include "StainedGlassBlock.h"
+
 #include <string>
 
-#include "StainedGlassBlock.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/level/tile/HalfTransparentTile.h"
diff --git a/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp b/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp
index cb40beae0..dac15a1c7 100644
--- a/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp
+++ b/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp
@@ -1,6 +1,7 @@
+#include "StainedGlassPaneBlock.h"
+
 #include <string>
 
-#include "StainedGlassPaneBlock.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/DyePowderItem.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/StairTile.cpp b/targets/minecraft/world/level/tile/StairTile.cpp
index 6df1a007e..ab1426a0d 100644
--- a/targets/minecraft/world/level/tile/StairTile.cpp
+++ b/targets/minecraft/world/level/tile/StairTile.cpp
@@ -1,4 +1,5 @@
 #include "StairTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp
index c8b02ba37..13dc89ce4 100644
--- a/targets/minecraft/world/level/tile/StemTile.cpp
+++ b/targets/minecraft/world/level/tile/StemTile.cpp
@@ -1,10 +1,11 @@
+#include "StemTile.h"
+
 #include <stdint.h>
 
-#include "minecraft/client/Minecraft.h"
-#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "StemTile.h"
 #include "Minecraft.Client/Common/App_enums.h"
+#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/Random.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/item/ItemInstance.h"
diff --git a/targets/minecraft/world/level/tile/StemTile.h b/targets/minecraft/world/level/tile/StemTile.h
index 8ade02a28..055bd88a1 100644
--- a/targets/minecraft/world/level/tile/StemTile.h
+++ b/targets/minecraft/world/level/tile/StemTile.h
@@ -2,8 +2,8 @@
 #include <memory>
 #include <string>
 
-#include "Tile.h"
 #include "PlantTile.h"
+#include "Tile.h"
 
 class ChunkRebuildData;
 class Icon;
diff --git a/targets/minecraft/world/level/tile/StoneButtonTile.cpp b/targets/minecraft/world/level/tile/StoneButtonTile.cpp
index a41c4a9f7..f05c2f552 100644
--- a/targets/minecraft/world/level/tile/StoneButtonTile.cpp
+++ b/targets/minecraft/world/level/tile/StoneButtonTile.cpp
@@ -1,4 +1,5 @@
 #include "StoneButtonTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/level/tile/ButtonTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp
index 883ea3c11..1a2a5cfca 100644
--- a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp
+++ b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/stdafx.h"
+#include "StoneMonsterTile.h"
 
+#include "minecraft/stdafx.h"
 #include "minecraft/world/entity/monster/net.minecraft.world.entity.monster.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
-#include "StoneMonsterTile.h"
 
 const unsigned int
     StoneMonsterTile::STONE_MONSTER_NAMES[STONE_MONSTER_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/StoneSlabTile.cpp b/targets/minecraft/world/level/tile/StoneSlabTile.cpp
index 53b05b67c..aa9c6c879 100644
--- a/targets/minecraft/world/level/tile/StoneSlabTile.cpp
+++ b/targets/minecraft/world/level/tile/StoneSlabTile.cpp
@@ -1,9 +1,9 @@
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "net.minecraft.world.level.tile.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "StoneSlabTile.h"
 
+#include "minecraft/net.minecraft.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "net.minecraft.world.level.tile.h"
 #include "strings.h"
 
 const unsigned int StoneSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/StoneTile.cpp b/targets/minecraft/world/level/tile/StoneTile.cpp
index 650865dfc..5b44ed7b4 100644
--- a/targets/minecraft/world/level/tile/StoneTile.cpp
+++ b/targets/minecraft/world/level/tile/StoneTile.cpp
@@ -1,4 +1,5 @@
 #include "StoneTile.h"
+
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp
index 11a791424..cebf347f9 100644
--- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp
+++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp
@@ -1,11 +1,12 @@
-#include "minecraft/client/Minecraft.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/net.minecraft.world.h"
 #include "TallGrassPlantTile.h"
+
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
+#include "minecraft/client/Minecraft.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
 
 const unsigned int
     TallGrass::TALL_GRASS_TILE_NAMES[TALL_GRASS_TILE_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp
index d8e61ee5a..2ea97ec62 100644
--- a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp
+++ b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp
@@ -1,6 +1,7 @@
+#include "TheEndPortalFrameTile.h"
+
 #include <memory>
 
-#include "TheEndPortalFrameTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.cpp b/targets/minecraft/world/level/tile/ThinFenceTile.cpp
index b816f9e92..a6fd37713 100644
--- a/targets/minecraft/world/level/tile/ThinFenceTile.cpp
+++ b/targets/minecraft/world/level/tile/ThinFenceTile.cpp
@@ -1,4 +1,5 @@
 #include "ThinFenceTile.h"
+
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/ItemInstance.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp
index abcf48eaa..05d5b5c03 100644
--- a/targets/minecraft/world/level/tile/Tile.cpp
+++ b/targets/minecraft/world/level/tile/Tile.cpp
@@ -1,24 +1,25 @@
+#include "Tile.h"
+
 #include <optional>
 
-#include "minecraft/stats/net.minecraft.stats.h"
+#include "console_helpers/StringHelpers.h"
 #include "minecraft/locale/net.minecraft.locale.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/stats/net.minecraft.stats.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/food/net.minecraft.world.food.h"
 #include "minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/material/net.minecraft.world.level.material.h"
-#include "net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/redstone/net.minecraft.world.level.redstone.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/food/net.minecraft.world.food.h"
+#include "minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/net.minecraft.h"
 #include "minecraft/world/phys/Vec3.h"
-#include "console_helpers/StringHelpers.h"
-#include "Tile.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "net.minecraft.world.level.tile.h"
 
 std::wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile.";
 
diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h
index 83c7547fe..6337f7794 100644
--- a/targets/minecraft/world/level/tile/Tile.h
+++ b/targets/minecraft/world/level/tile/Tile.h
@@ -1,12 +1,13 @@
 #pragma once
-#include "minecraft/world/level/material/Material.h"
-#include "minecraft/world/phys/Vec3.h"
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <vector>
+
 #include "console_helpers/Definitions.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include <cstdint>
-#include <optional>
-#include <memory>
-#include <vector>
+#include "minecraft/world/level/material/Material.h"
+#include "minecraft/world/phys/Vec3.h"
 
 class GrassTile;
 class LeafTile;
diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp
index df3361905..e542b2ff0 100644
--- a/targets/minecraft/world/level/tile/TntTile.cpp
+++ b/targets/minecraft/world/level/tile/TntTile.cpp
@@ -1,12 +1,13 @@
+#include "TntTile.h"
+
 #include <string>
 
-#include "TntTile.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/sounds/SoundTypes.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/LivingEntity.h"
diff --git a/targets/minecraft/world/level/tile/TopSnowTile.cpp b/targets/minecraft/world/level/tile/TopSnowTile.cpp
index 08e3e61f5..2a78dbb92 100644
--- a/targets/minecraft/world/level/tile/TopSnowTile.cpp
+++ b/targets/minecraft/world/level/tile/TopSnowTile.cpp
@@ -1,7 +1,8 @@
+#include "TopSnowTile.h"
+
 #include <optional>
 #include <string>
 
-#include "TopSnowTile.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/item/Item.h"
diff --git a/targets/minecraft/world/level/tile/TorchTile.cpp b/targets/minecraft/world/level/tile/TorchTile.cpp
index 5c6809c1f..c42dee107 100644
--- a/targets/minecraft/world/level/tile/TorchTile.cpp
+++ b/targets/minecraft/world/level/tile/TorchTile.cpp
@@ -1,6 +1,7 @@
+#include "TorchTile.h"
+
 #include <optional>
 
-#include "TorchTile.h"
 #include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/TransparentTile.cpp b/targets/minecraft/world/level/tile/TransparentTile.cpp
index 4d4794f3c..32df35bc1 100644
--- a/targets/minecraft/world/level/tile/TransparentTile.cpp
+++ b/targets/minecraft/world/level/tile/TransparentTile.cpp
@@ -1,4 +1,5 @@
 #include "TransparentTile.h"
+
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/tile/Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/TrapDoorTile.cpp b/targets/minecraft/world/level/tile/TrapDoorTile.cpp
index 4aba1d5e3..214137e61 100644
--- a/targets/minecraft/world/level/tile/TrapDoorTile.cpp
+++ b/targets/minecraft/world/level/tile/TrapDoorTile.cpp
@@ -1,6 +1,7 @@
+#include "TrapDoorTile.h"
+
 #include <optional>
 
-#include "TrapDoorTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/TreeTile.cpp b/targets/minecraft/world/level/tile/TreeTile.cpp
index 70954b6a7..8da5dff05 100644
--- a/targets/minecraft/world/level/tile/TreeTile.cpp
+++ b/targets/minecraft/world/level/tile/TreeTile.cpp
@@ -1,11 +1,10 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h"
-#include "minecraft/net.minecraft.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "LeafTile.h"
-
 #include "TreeTile.h"
 
+#include "LeafTile.h"
+#include "minecraft/net.minecraft.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/piston/net.minecraft.world.level.tile.piston.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "strings.h"
 
 const unsigned int TreeTile::TREE_NAMES[TreeTile::TREE_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp
index be5bfcd64..fc910c128 100644
--- a/targets/minecraft/world/level/tile/TripWireSourceTile.cpp
+++ b/targets/minecraft/world/level/tile/TripWireSourceTile.cpp
@@ -1,9 +1,9 @@
 #include "TripWireSourceTile.h"
-#include "optional"
-#include "minecraft/sounds/SoundTypes.h"
+
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/material/Material.h"
@@ -11,6 +11,7 @@
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/TripWireTile.h"
 #include "minecraft/world/phys/AABB.h"
+#include "optional"
 
 TripWireSourceTile::TripWireSourceTile(int id)
     : Tile(id, Material::decoration, false) {
diff --git a/targets/minecraft/world/level/tile/TripWireTile.cpp b/targets/minecraft/world/level/tile/TripWireTile.cpp
index 0b7224d24..3183c9607 100644
--- a/targets/minecraft/world/level/tile/TripWireTile.cpp
+++ b/targets/minecraft/world/level/tile/TripWireTile.cpp
@@ -1,8 +1,9 @@
-#include <optional>
+#include "TripWireTile.h"
+
 #include <format>
+#include <optional>
 #include <vector>
 
-#include "TripWireTile.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/level/tile/VineTile.cpp b/targets/minecraft/world/level/tile/VineTile.cpp
index 4f948c55b..ea6c49df7 100644
--- a/targets/minecraft/world/level/tile/VineTile.cpp
+++ b/targets/minecraft/world/level/tile/VineTile.cpp
@@ -1,11 +1,11 @@
+#include "VineTile.h"
+
 #include <optional>
 
-#include "VineTile.h"
-#include "minecraft/world/level/material/Material.h"
 #include "java/JavaMath.h"
-#include "minecraft/Facing.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
+#include "minecraft/Facing.h"
 #include "minecraft/stats/GenericStats.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/item/Item.h"
@@ -15,6 +15,7 @@
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
 #include "minecraft/world/level/biome/Biome.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/phys/AABB.h"
 
diff --git a/targets/minecraft/world/level/tile/WallTile.cpp b/targets/minecraft/world/level/tile/WallTile.cpp
index 5941d76ea..d38468613 100644
--- a/targets/minecraft/world/level/tile/WallTile.cpp
+++ b/targets/minecraft/world/level/tile/WallTile.cpp
@@ -1,10 +1,10 @@
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "net.minecraft.world.level.tile.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/net.minecraft.h"
 #include "WallTile.h"
 
+#include "minecraft/net.minecraft.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "net.minecraft.world.level.tile.h"
 #include "strings.h"
 
 const float WallTile::WALL_WIDTH = 3.0f / 16.0f;
diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp
index bba48bd5c..c39d8a64a 100644
--- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp
+++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp
@@ -1,11 +1,12 @@
+#include "WaterLilyTile.h"
+
 #include <memory>
 #include <optional>
 
-#include "WaterLilyTile.h"
-#include "minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "java/Class.h"
+#include "minecraft/client/Minecraft.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/WebTile.cpp b/targets/minecraft/world/level/tile/WebTile.cpp
index 8c3d4429f..98692d4d0 100644
--- a/targets/minecraft/world/level/tile/WebTile.cpp
+++ b/targets/minecraft/world/level/tile/WebTile.cpp
@@ -1,7 +1,8 @@
+#include "WebTile.h"
+
 #include <memory>
 #include <optional>
 
-#include "WebTile.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/item/Item.h"
 #include "minecraft/world/level/material/Material.h"
diff --git a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp
index 709ffcefc..76f90bb1b 100644
--- a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp
+++ b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp
@@ -1,7 +1,8 @@
+#include "WeightedPressurePlateTile.h"
+
 #include <algorithm>
 #include <vector>
 
-#include "WeightedPressurePlateTile.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/Entity.h"
diff --git a/targets/minecraft/world/level/tile/WoodButtonTile.cpp b/targets/minecraft/world/level/tile/WoodButtonTile.cpp
index baa056b92..8fd8955cc 100644
--- a/targets/minecraft/world/level/tile/WoodButtonTile.cpp
+++ b/targets/minecraft/world/level/tile/WoodButtonTile.cpp
@@ -1,4 +1,5 @@
 #include "WoodButtonTile.h"
+
 #include "minecraft/Facing.h"
 #include "minecraft/world/level/tile/ButtonTile.h"
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/WoodSlabTile.cpp b/targets/minecraft/world/level/tile/WoodSlabTile.cpp
index 82dbdfd3a..feef37290 100644
--- a/targets/minecraft/world/level/tile/WoodSlabTile.cpp
+++ b/targets/minecraft/world/level/tile/WoodSlabTile.cpp
@@ -1,11 +1,11 @@
 #include "WoodSlabTile.h"
-#include "WoodTile.h"
-#include "TreeTile.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/stats/net.minecraft.stats.h"
 
+#include "TreeTile.h"
+#include "WoodTile.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
 #include "strings.h"
 
 const unsigned int WoodSlabTile::SLAB_NAMES[SLAB_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/WoodSlabTile.h b/targets/minecraft/world/level/tile/WoodSlabTile.h
index 49c78b16c..d51b18fa3 100644
--- a/targets/minecraft/world/level/tile/WoodSlabTile.h
+++ b/targets/minecraft/world/level/tile/WoodSlabTile.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Tile.h"
 #include "HalfSlabTile.h"
+#include "Tile.h"
 
 class Player;
 
diff --git a/targets/minecraft/world/level/tile/WoodTile.cpp b/targets/minecraft/world/level/tile/WoodTile.cpp
index 54a083b95..2ff1ef565 100644
--- a/targets/minecraft/world/level/tile/WoodTile.cpp
+++ b/targets/minecraft/world/level/tile/WoodTile.cpp
@@ -1,11 +1,11 @@
 #include "WoodTile.h"
-#include "TreeTile.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/stats/net.minecraft.stats.h"
-#include "minecraft/world/net.minecraft.world.h"
 
+#include "TreeTile.h"
+#include "minecraft/stats/net.minecraft.stats.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/biome/net.minecraft.world.level.biome.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/net.minecraft.world.h"
 #include "strings.h"
 
 const unsigned int WoodTile::WOOD_NAMES[WOOD_NAMES_LENGTH] = {
diff --git a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp
index 750d8ae5d..5cda7be4e 100644
--- a/targets/minecraft/world/level/tile/WoolCarpetTile.cpp
+++ b/targets/minecraft/world/level/tile/WoolCarpetTile.cpp
@@ -1,6 +1,7 @@
+#include "WoolCarpetTile.h"
+
 #include <optional>
 
-#include "WoolCarpetTile.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
diff --git a/targets/minecraft/world/level/tile/WoolCarpetTile.h b/targets/minecraft/world/level/tile/WoolCarpetTile.h
index e2e7c4cf0..28bd1f422 100644
--- a/targets/minecraft/world/level/tile/WoolCarpetTile.h
+++ b/targets/minecraft/world/level/tile/WoolCarpetTile.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <optional>
 #include <memory>
+#include <optional>
 
 #include "Tile.h"
 
diff --git a/targets/minecraft/world/level/tile/WorkbenchTile.cpp b/targets/minecraft/world/level/tile/WorkbenchTile.cpp
index c9099ede6..420861199 100644
--- a/targets/minecraft/world/level/tile/WorkbenchTile.cpp
+++ b/targets/minecraft/world/level/tile/WorkbenchTile.cpp
@@ -1,7 +1,8 @@
+#include "WorkbenchTile.h"
+
 #include <memory>
 #include <string>
 
-#include "WorkbenchTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp
index 1023f28f9..5307b5b42 100644
--- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp
@@ -1,13 +1,13 @@
-#include "minecraft/stdafx.h"
+#include "BeaconTileEntity.h"
 
 #include "minecraft/network/packet/net.minecraft.network.packet.h"
+#include "minecraft/stdafx.h"
 #include "minecraft/world/effect/net.minecraft.world.effect.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "minecraft/world/phys/net.minecraft.world.phys.h"
-#include "BeaconTileEntity.h"
 
 std::shared_ptr<TileEntity> BeaconTileEntity::clone() {
     std::shared_ptr<BeaconTileEntity> result =
diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h
index 54106b36c..076361f5b 100644
--- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "TileEntity.h"
-#include "minecraft/world/Container.h"
 #include "minecraft/SharedConstants.h"
+#include "minecraft/world/Container.h"
 
 class MobEffect;
 
diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
index 30ab7ae6f..1d23c32a9 100644
--- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp
@@ -1,13 +1,13 @@
-#include "minecraft/stdafx.h"
-
-#include "nbt/com.mojang.nbt.h"
 #include "BrewingStandTileEntity.h"
+
 #include "minecraft/SharedConstants.h"
 #include "minecraft/net.minecraft.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
+#include "minecraft/stdafx.h"
 #include "minecraft/world/item/alchemy/PotionMacros.h"
+#include "minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "nbt/com.mojang.nbt.h"
 
 int slotsForUp[] = {BrewingStandTileEntity::INGREDIENT_SLOT};
 int slotsForOtherFaces[] = {0, 1, 2};
diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp
index 1711a67fe..0b8a232b2 100644
--- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp
@@ -1,18 +1,18 @@
-#include "minecraft/stdafx.h"
-
-#include "nbt/com.mojang.nbt.h"
-#include "minecraft/world/net.minecraft.world.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
-#include "TileEntity.h"
-#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
-#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
-#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
-#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
 #include "ChestTileEntity.h"
+
+#include "TileEntity.h"
 #include "minecraft/network/packet/ContainerOpenPacket.h"
 #include "minecraft/sounds/SoundTypes.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
+#include "minecraft/world/inventory/net.minecraft.world.inventory.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
+#include "minecraft/world/net.minecraft.world.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "nbt/com.mojang.nbt.h"
 
 int ChestTileEntity::getContainerType() {
     if (isBonusChest)
diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h
index f969ac57f..4c5118afe 100644
--- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h
@@ -2,7 +2,6 @@
 
 #include "TileEntity.h"
 #include "minecraft/world/Container.h"
-
 #include "nbt/ListTag.h"
 
 class Player;
diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp
index 02830e1fd..bc0123023 100644
--- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp
@@ -1,11 +1,13 @@
+#include "CommandBlockEntity.h"
+
 #include <assert.h>
+
 #include <memory>
 
-#include "CommandBlockEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/Pos.h"
 #include "minecraft/network/packet/TileEntityDataPacket.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 class Level;
 
diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h
index c4bcb1de4..c68b21c39 100644
--- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h
+++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h
@@ -3,8 +3,8 @@
 #include <string>
 
 #include "TileEntity.h"
-#include "minecraft/commands/CommandSender.h"
 #include "java/Class.h"
+#include "minecraft/commands/CommandSender.h"
 #include "minecraft/commands/CommandsEnum.h"
 #include "minecraft/network/packet/ChatPacket.h"
 
diff --git a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp
index 8b0efdc29..c04f3fe70 100644
--- a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp
@@ -1,9 +1,10 @@
+#include "ComparatorTileEntity.h"
+
 #include <memory>
 #include <string>
 
-#include "ComparatorTileEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 void ComparatorTileEntity::save(CompoundTag* tag) {
     TileEntity::save(tag);
diff --git a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp
index 49dd9bc9d..93a71b932 100644
--- a/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/DaylightDetectorTileEntity.cpp
@@ -1,6 +1,7 @@
+#include "DaylightDetectorTileEntity.h"
+
 #include <memory>
 
-#include "DaylightDetectorTileEntity.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/DaylightDetectorTile.h"
diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp
index d33b09821..082bee046 100644
--- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp
@@ -1,12 +1,12 @@
-#include "minecraft/stdafx.h"
+#include "DispenserTileEntity.h"
 
-#include "nbt/com.mojang.nbt.h"
 #include "TileEntity.h"
-#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "minecraft/stdafx.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/item/net.minecraft.world.item.h"
-#include "DispenserTileEntity.h"
+#include "minecraft/world/level/net.minecraft.world.level.h"
+#include "nbt/com.mojang.nbt.h"
 
 DispenserTileEntity::DispenserTileEntity() : TileEntity() {
     items = std::vector<std::shared_ptr<ItemInstance>>(9);
diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h
index 1f1c0e143..f9eb66dd7 100644
--- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "nbt/com.mojang.nbt.h"
 #include "TileEntity.h"
 #include "minecraft/world/Container.h"
+#include "nbt/com.mojang.nbt.h"
 
 class Player;
 class Random;
diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp
index 01444600c..861fd8919 100644
--- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp
@@ -1,10 +1,10 @@
-#include "minecraft/stdafx.h"
-
-#include <string>
-#include <memory>
-
 #include "DropperTileEntity.h"
 
+#include <memory>
+#include <string>
+
+#include "minecraft/stdafx.h"
+
 std::wstring DropperTileEntity::getName() {
     return hasCustomName() ? name : app.GetString(IDS_CONTAINER_DROPPER);
 }
diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp
index 18e577379..ef277fff3 100644
--- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp
@@ -1,8 +1,8 @@
+#include "EnchantmentTableTileEntity.h"
+
 #include <cmath>
 
 #include "minecraft/stdafx.h"
-
-#include "EnchantmentTableTileEntity.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 
diff --git a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp
index 7a98e6137..819f34f0c 100644
--- a/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/EnderChestTileEntity.cpp
@@ -1,6 +1,7 @@
 #include "EnderChestTileEntity.h"
-#include "minecraft/sounds/SoundTypes.h"
+
 #include "java/Random.h"
+#include "minecraft/sounds/SoundTypes.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/ChestTile.h"
diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp
index 0540491d8..81b422c40 100644
--- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp
@@ -1,14 +1,14 @@
-#include "minecraft/stdafx.h"
+#include "FurnaceTileEntity.h"
 
-#include "nbt/com.mojang.nbt.h"
 #include "minecraft/net.minecraft.h"
+#include "minecraft/stdafx.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
-#include "minecraft/world/item/net.minecraft.world.item.h"
 #include "minecraft/world/item/crafting/net.minecraft.world.item.crafting.h"
+#include "minecraft/world/item/net.minecraft.world.item.h"
+#include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "minecraft/world/level/material/Material.h"
-#include "FurnaceTileEntity.h"
+#include "nbt/com.mojang.nbt.h"
 
 int furnaceSlotsForUp[] = {FurnaceTileEntity::SLOT_INPUT};
 int furnaceSlotsForDown[] = {FurnaceTileEntity::SLOT_RESULT,
diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h
index 84551dc10..5174a5fd6 100644
--- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "minecraft/world/level/tile/FurnaceTile.h"
 #include "TileEntity.h"
 #include "minecraft/world/WorldlyContainer.h"
+#include "minecraft/world/level/tile/FurnaceTile.h"
 
 class Player;
 class Level;
diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp
index 5e551ca5f..9b6cdebe8 100644
--- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp
@@ -1,16 +1,16 @@
-#include "minecraft/stdafx.h"
+#include "HopperTileEntity.h"
 
 #include "minecraft/net.minecraft.h"
-#include "minecraft/world/entity/net.minecraft.world.entity.h"
+#include "minecraft/stdafx.h"
+#include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/item/net.minecraft.world.entity.item.h"
+#include "minecraft/world/entity/net.minecraft.world.entity.h"
 #include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "minecraft/world/level/net.minecraft.world.level.h"
 #include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
-#include "net.minecraft.world.level.tile.entity.h"
-#include "minecraft/world/phys/net.minecraft.world.phys.h"
 #include "minecraft/world/net.minecraft.world.h"
-#include "HopperTileEntity.h"
-#include "minecraft/util/Mth.h"
+#include "minecraft/world/phys/net.minecraft.world.phys.h"
+#include "net.minecraft.world.level.tile.entity.h"
 
 HopperTileEntity::HopperTileEntity() {
     items = std::vector<std::shared_ptr<ItemInstance>>(5);
diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h
index d0274225c..a0a53e6be 100644
--- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "TileEntity.h"
 #include "Hopper.h"
+#include "TileEntity.h"
 
 class ItemEntity;
 
diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp
index 6c638079c..543d67472 100644
--- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp
@@ -1,12 +1,13 @@
+#include "MobSpawnerTileEntity.h"
+
 #include <memory>
 
-#include "MobSpawnerTileEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/network/packet/TileEntityDataPacket.h"
 #include "minecraft/world/level/BaseMobSpawner.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 MobSpawnerTileEntity::TileEntityMobSpawner::TileEntityMobSpawner(
     MobSpawnerTileEntity* parent) {
diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h
index c8c554a78..2cceaee2f 100644
--- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h
@@ -3,8 +3,8 @@
 #include <string>
 
 #include "TileEntity.h"
-#include "minecraft/world/level/BaseMobSpawner.h"
 #include "java/Class.h"
+#include "minecraft/world/level/BaseMobSpawner.h"
 
 class Packet;
 class Entity;
diff --git a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp
index 238bd225b..7c8ca9f41 100644
--- a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp
@@ -1,12 +1,13 @@
+#include "MusicTileEntity.h"
+
 #include <memory>
 #include <string>
 
-#include "MusicTileEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 MusicTileEntity::MusicTileEntity() : TileEntity() {
     note = 0;
diff --git a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp
index 1b4961a3f..ea9ba1195 100644
--- a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp
@@ -1,7 +1,8 @@
+#include "PistonMovingTileEntity.h"
+
 #include <optional>
 #include <string>
 
-#include "PistonMovingTileEntity.h"
 #include "PistonPieceTileEntity.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/IconRegister.h"
diff --git a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp
index 02fd2a61e..5b59a2ac4 100644
--- a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp
@@ -1,17 +1,18 @@
+#include "PistonPieceTileEntity.h"
+
 #include <format>
 #include <memory>
 #include <optional>
 #include <string>
 #include <vector>
 
-#include "PistonPieceTileEntity.h"
 #include "PistonMovingTileEntity.h"
 #include "minecraft/Facing.h"
-#include "minecraft/world/level/tile/Tile.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
+#include "minecraft/world/level/tile/Tile.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 PistonPieceEntity::PistonPieceEntity() {
     // for the tile entity loader
diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp
index a6a541e01..6b26ef662 100644
--- a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp
@@ -1,13 +1,14 @@
+#include "SignTileEntity.h"
+
 #include <wchar.h>
 
-#include "SignTileEntity.h"
+#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "minecraft/client/Minecraft.h"
+#include "minecraft/network/packet/SignUpdatePacket.h"
 #include "minecraft/server/level/ServerLevel.h"
 #include "minecraft/world/level/Level.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "nbt/CompoundTag.h"
-#include "minecraft/network/packet/SignUpdatePacket.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 const int SignTileEntity::MAX_LINE_LENGTH = 15;
 
diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.h b/targets/minecraft/world/level/tile/entity/SignTileEntity.h
index 60977f524..7983ba814 100644
--- a/targets/minecraft/world/level/tile/entity/SignTileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.h
@@ -4,9 +4,9 @@
 #include <string>
 
 #include "TileEntity.h"
-#include "platform/IPlatformInput.h"
 #include "java/Class.h"
 #include "minecraft/world/entity/player/Player.h"
+#include "platform/IPlatformInput.h"
 
 #define MAX_SIGN_LINES 4
 
diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp
index 8cbdbae04..7aff9dd72 100644
--- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp
@@ -1,10 +1,11 @@
+#include "SkullTileEntity.h"
+
 #include <cstdint>
 #include <memory>
 
-#include "SkullTileEntity.h"
-#include "nbt/CompoundTag.h"
 #include "minecraft/network/packet/TileEntityDataPacket.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 SkullTileEntity::SkullTileEntity() {
     skullType = 0;
diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp
index 59fb5b970..c23b00da8 100644
--- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp
+++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp
@@ -1,12 +1,13 @@
+#include "TheEndPortalTile.h"
+
 #include <string>
 
-#include "TheEndPortalTile.h"
-#include "TheEndPortalTileEntity.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "minecraft/core/particles/ParticleTypes.h"
+#include "TheEndPortalTileEntity.h"
 #include "java/Class.h"
 #include "java/Random.h"
+#include "minecraft/core/particles/ParticleTypes.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/Entity.h"
 #include "minecraft/world/level/Level.h"
diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h
index c07594b68..60b54f900 100644
--- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h
+++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.h
@@ -2,8 +2,8 @@
 #include <cstdint>
 #include <memory>
 
-#include "minecraft/world/level/tile/EntityTile.h"
 #include "minecraft/world/level/tile/BaseEntityTile.h"
+#include "minecraft/world/level/tile/EntityTile.h"
 
 class IconRegister;
 class Material;
diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp
index b657fd570..819a4ca04 100644
--- a/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTileEntity.cpp
@@ -1,6 +1,7 @@
+#include "TheEndPortalTileEntity.h"
+
 #include <memory>
 
-#include "TheEndPortalTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 
 // 4J Added
diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp
index c9f2feedf..aca4b6e9f 100644
--- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp
+++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp
@@ -1,10 +1,9 @@
+#include "TileEntity.h"
+
 #include <utility>
 
-#include "TileEntity.h"
-#include "PistonPieceTileEntity.h"
-#include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "nbt/CompoundTag.h"
+#include "PistonPieceTileEntity.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/JukeboxTile.h"
 #include "minecraft/world/level/tile/Tile.h"
@@ -25,6 +24,8 @@
 #include "minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "minecraft/world/level/tile/entity/SkullTileEntity.h"
 #include "minecraft/world/level/tile/entity/TheEndPortalTileEntity.h"
+#include "minecraft/world/level/tile/entity/TileEntity.h"
+#include "nbt/CompoundTag.h"
 
 TileEntity::idToCreateMapType TileEntity::idCreateMap =
     std::unordered_map<std::wstring, tileEntityCreateFn>();
diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.h b/targets/minecraft/world/level/tile/entity/TileEntity.h
index 5da51f5d1..81cd9981c 100644
--- a/targets/minecraft/world/level/tile/entity/TileEntity.h
+++ b/targets/minecraft/world/level/tile/entity/TileEntity.h
@@ -5,8 +5,8 @@
 #include <unordered_map>
 
 #include "console_helpers/HashExtension.h"
-#include "java/JavaIntHash.h"
 #include "java/Class.h"
+#include "java/JavaIntHash.h"
 
 class Level;
 class Packet;
diff --git a/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h b/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h
index b123f7d82..d5f0606af 100644
--- a/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h
+++ b/targets/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h
@@ -9,14 +9,14 @@
 #include "DispenserTileEntity.h"
 #include "DropperTileEntity.h"
 #include "EnchantmentTableTileEntity.h"
+#include "EnderChestTileEntity.h"
 #include "FurnaceTileEntity.h"
 #include "Hopper.h"
 #include "HopperTileEntity.h"
 #include "MobSpawnerTileEntity.h"
 #include "MusicTileEntity.h"
-#include "SignTileEntity.h"
-#include "TileEntity.h"
 #include "PistonMovingTileEntity.h"
-#include "TheEndPortalTileEntity.h"
+#include "SignTileEntity.h"
 #include "SkullTileEntity.h"
-#include "EnderChestTileEntity.h"
+#include "TheEndPortalTileEntity.h"
+#include "TileEntity.h"
diff --git a/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h b/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h
index a3fa8a7a4..918613803 100644
--- a/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h
+++ b/targets/minecraft/world/level/tile/net.minecraft.world.level.tile.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Tile.h"
 #include "AirTile.h"
 #include "AnvilTile.h"
 #include "BaseEntityTile.h"
@@ -10,7 +9,6 @@
 #include "BedTile.h"
 #include "BookshelfTile.h"
 #include "BrewingStandTile.h"
-#include "PlantTile.h"
 #include "ButtonTile.h"
 #include "CactusTile.h"
 #include "CakeTile.h"
@@ -67,15 +65,14 @@
 #include "MetalTile.h"
 #include "MobSpawnerTile.h"
 #include "MushroomPlantTile.h"
-#include "NoteBlockTile.h"
 #include "MycelTile.h"
-#include "NetherrackTile.h"
 #include "NetherWartTile.h"
+#include "NetherrackTile.h"
 #include "NotGateTile.h"
+#include "NoteBlockTile.h"
 #include "ObsidianTile.h"
 #include "OreTile.h"
-#include "minecraft/world/level/tile/piston/PistonBaseTile.h"
-#include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
+#include "PlantTile.h"
 #include "PortalTile.h"
 #include "PotatoTile.h"
 #include "PoweredMetalTile.h"
@@ -84,9 +81,9 @@
 #include "PumpkinTile.h"
 #include "QuartzBlockTile.h"
 #include "RailTile.h"
-#include "RedlightTile.h"
 #include "RedStoneDustTile.h"
 #include "RedStoneOreTile.h"
+#include "RedlightTile.h"
 #include "ReedTile.h"
 #include "RepeaterTile.h"
 #include "RotatedPillarTile.h"
@@ -107,9 +104,9 @@
 #include "StoneSlabTile.h"
 #include "StoneTile.h"
 #include "TallGrassPlantTile.h"
-#include "minecraft/world/level/tile/entity/TheEndPortalTile.h"
 #include "TheEndPortalFrameTile.h"
 #include "ThinFenceTile.h"
+#include "Tile.h"
 #include "TntTile.h"
 #include "TopSnowTile.h"
 #include "TorchTile.h"
@@ -124,8 +121,10 @@
 #include "WebTile.h"
 #include "WeightedPressurePlateTile.h"
 #include "WoodButtonTile.h"
-#include "WorkbenchTile.h"
-#include "WoodTile.h"
-#include "HalfSlabTile.h"
 #include "WoodSlabTile.h"
+#include "WoodTile.h"
 #include "WoolCarpetTile.h"
+#include "WorkbenchTile.h"
+#include "minecraft/world/level/tile/entity/TheEndPortalTile.h"
+#include "minecraft/world/level/tile/piston/PistonBaseTile.h"
+#include "minecraft/world/level/tile/piston/PistonExtensionTile.h"
diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp
index aac957ba3..84ffa5f18 100644
--- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp
+++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp
@@ -1,29 +1,30 @@
+#include "PistonBaseTile.h"
+
 #include <optional>
 
-#include "PistonBaseTile.h"
-#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h"
-#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h"
+#include "Minecraft.Client/include/NetTypes.h"
+#include "Minecraft.Client/include/SkinBox.h"
+#include "Minecraft.Client/include/XboxStubs.h"
 #include "PistonExtensionTile.h"
+#include "java/Random.h"
 #include "minecraft/Facing.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/multiplayer/MultiPlayerLevel.h"
-#include "minecraft/world/level/chunk/LevelChunk.h"
-#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/sounds/SoundTypes.h"
-#include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/IconRegister.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LevelSource.h"
+#include "minecraft/world/level/chunk/LevelChunk.h"
+#include "minecraft/world/level/dimension/Dimension.h"
 #include "minecraft/world/level/material/Material.h"
 #include "minecraft/world/level/tile/Tile.h"
+#include "minecraft/world/level/tile/entity/PistonMovingTileEntity.h"
+#include "minecraft/world/level/tile/entity/PistonPieceTileEntity.h"
 #include "minecraft/world/level/tile/entity/TileEntity.h"
 #include "minecraft/world/phys/AABB.h"
-#include "Minecraft.Client/include/NetTypes.h"
-#include "Minecraft.Client/include/XboxStubs.h"
-#include "Minecraft.Client/include/SkinBox.h"
 
 class Icon;
 
diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h
index 96bb7391b..6efa246f9 100644
--- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h
+++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
-#include <optional>
 #include <memory>
+#include <optional>
 #include <string>
 
 #include "minecraft/world/level/tile/Tile.h"
diff --git a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp
index c845c0724..48ce0b413 100644
--- a/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp
+++ b/targets/minecraft/world/level/tile/piston/PistonExtensionTile.cpp
@@ -1,4 +1,5 @@
 #include "PistonExtensionTile.h"
+
 #include "PistonBaseTile.h"
 #include "minecraft/Facing.h"
 #include "minecraft/world/entity/player/Abilities.h"
diff --git a/targets/minecraft/world/net.minecraft.world.h b/targets/minecraft/world/net.minecraft.world.h
index 8b4f3e34e..76da5855f 100644
--- a/targets/minecraft/world/net.minecraft.world.h
+++ b/targets/minecraft/world/net.minecraft.world.h
@@ -4,12 +4,11 @@
 #include "Container.h"
 #include "Difficulty.h"
 #include "MouseInventoryClickHandler.h"
-#include "net.minecraft.world.ContainerListener.h"
 #include "SimpleContainer.h"
+#include "net.minecraft.world.ContainerListener.h"
 
 // TU10
+#include "FlippedIcon.h"
 #include "Icon.h"
 #include "IconRegister.h"
-#include "FlippedIcon.h"
-
 #include "WorldlyContainer.h"
\ No newline at end of file
diff --git a/targets/minecraft/world/phys/AABB.cpp b/targets/minecraft/world/phys/AABB.cpp
index c793d9e77..fadd96722 100644
--- a/targets/minecraft/world/phys/AABB.cpp
+++ b/targets/minecraft/world/phys/AABB.cpp
@@ -5,14 +5,15 @@
 
 // TODO: use brace initialization everywhere
 
+#include "minecraft/world/phys/AABB.h"
+
+#include <algorithm>
 #include <format>
 #include <optional>
-#include <algorithm>
 #include <string>
 
 #include "HitResult.h"
 #include "minecraft/world/phys/AABB.h"
-#include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
 AABB::AABB(double x0, double y0, double z0, double x1, double y1, double z1) {
diff --git a/targets/minecraft/world/phys/HitResult.cpp b/targets/minecraft/world/phys/HitResult.cpp
index bc0213583..c01b34433 100644
--- a/targets/minecraft/world/phys/HitResult.cpp
+++ b/targets/minecraft/world/phys/HitResult.cpp
@@ -1,4 +1,5 @@
 #include "HitResult.h"
+
 #include "minecraft/world/entity/Entity.h"
 
 HitResult::HitResult(int x, int y, int z, int f, const Vec3& pos) {
diff --git a/targets/minecraft/world/phys/Vec3.cpp b/targets/minecraft/world/phys/Vec3.cpp
index 9b08e21ae..b06079cec 100644
--- a/targets/minecraft/world/phys/Vec3.cpp
+++ b/targets/minecraft/world/phys/Vec3.cpp
@@ -1,9 +1,10 @@
+#include "minecraft/world/phys/Vec3.h"
+
+#include <cmath>
 #include <format>
 #include <optional>
-#include <cmath>
 #include <string>
 
-#include "minecraft/world/phys/Vec3.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/world/scores/Objective.cpp b/targets/minecraft/world/scores/Objective.cpp
index 9d97636c3..5ca767fd2 100644
--- a/targets/minecraft/world/scores/Objective.cpp
+++ b/targets/minecraft/world/scores/Objective.cpp
@@ -1,4 +1,5 @@
 #include "Objective.h"
+
 #include "minecraft/world/scores/Scoreboard.h"
 
 Objective::Objective(Scoreboard* scoreboard, const std::wstring& name,
diff --git a/targets/minecraft/world/scores/PlayerTeam.cpp b/targets/minecraft/world/scores/PlayerTeam.cpp
index d8759847c..137d27eec 100644
--- a/targets/minecraft/world/scores/PlayerTeam.cpp
+++ b/targets/minecraft/world/scores/PlayerTeam.cpp
@@ -1,4 +1,5 @@
 #include "PlayerTeam.h"
+
 #include "minecraft/world/scores/Scoreboard.h"
 #include "minecraft/world/scores/Team.h"
 
diff --git a/targets/minecraft/world/scores/Score.cpp b/targets/minecraft/world/scores/Score.cpp
index 1c3ced32f..c280691cc 100644
--- a/targets/minecraft/world/scores/Score.cpp
+++ b/targets/minecraft/world/scores/Score.cpp
@@ -1,4 +1,5 @@
 #include "Score.h"
+
 #include "minecraft/world/scores/Objective.h"
 #include "minecraft/world/scores/Scoreboard.h"
 #include "minecraft/world/scores/criteria/ObjectiveCriteria.h"
diff --git a/targets/minecraft/world/scores/criteria/DummyCriteria.cpp b/targets/minecraft/world/scores/criteria/DummyCriteria.cpp
index 06c504c93..2fadcf7fb 100644
--- a/targets/minecraft/world/scores/criteria/DummyCriteria.cpp
+++ b/targets/minecraft/world/scores/criteria/DummyCriteria.cpp
@@ -1,6 +1,7 @@
+#include "DummyCriteria.h"
+
 #include <unordered_map>
 
-#include "DummyCriteria.h"
 #include "minecraft/world/scores/criteria/ObjectiveCriteria.h"
 
 DummyCriteria::DummyCriteria(const std::wstring& name) {
diff --git a/targets/minecraft/world/scores/criteria/HealthCriteria.cpp b/targets/minecraft/world/scores/criteria/HealthCriteria.cpp
index ddb017b18..d6bfaca87 100644
--- a/targets/minecraft/world/scores/criteria/HealthCriteria.cpp
+++ b/targets/minecraft/world/scores/criteria/HealthCriteria.cpp
@@ -1,7 +1,8 @@
+#include "HealthCriteria.h"
+
 #include <memory>
 #include <vector>
 
-#include "HealthCriteria.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/entity/player/Player.h"
 #include "minecraft/world/scores/criteria/DummyCriteria.h"
diff --git a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp
index d30c0f064..7a0c551ce 100644
--- a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp
+++ b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp
@@ -1,4 +1,5 @@
 #include "ObjectiveCriteria.h"
+
 #include "minecraft/world/scores/criteria/DummyCriteria.h"
 #include "minecraft/world/scores/criteria/HealthCriteria.h"
 
diff --git a/targets/minecraft/world/scores/net.minecraft.world.scores.h b/targets/minecraft/world/scores/net.minecraft.world.scores.h
index 0dccff460..57cb7a333 100644
--- a/targets/minecraft/world/scores/net.minecraft.world.scores.h
+++ b/targets/minecraft/world/scores/net.minecraft.world.scores.h
@@ -3,7 +3,7 @@
 #include "Objective.h"
 #include "PlayerTeam.h"
 #include "Score.h"
+#include "ScoreHolder.h"
 #include "Scoreboard.h"
 #include "ScoreboardSaveData.h"
-#include "ScoreHolder.h"
 #include "Team.h"
\ No newline at end of file
diff --git a/targets/nbt/include/nbt/CompoundTag.h b/targets/nbt/include/nbt/CompoundTag.h
index 4e8623c7a..bba689784 100644
--- a/targets/nbt/include/nbt/CompoundTag.h
+++ b/targets/nbt/include/nbt/CompoundTag.h
@@ -1,18 +1,18 @@
 #pragma once
-#include "Tag.h"
-#include "ListTag.h"
+#include <memory>
+#include <unordered_map>
+
+#include "ByteArrayTag.h"
 #include "ByteTag.h"
 #include "DoubleTag.h"
 #include "FloatTag.h"
+#include "IntArrayTag.h"
 #include "IntTag.h"
+#include "ListTag.h"
 #include "LongTag.h"
 #include "ShortTag.h"
 #include "StringTag.h"
-#include "ByteArrayTag.h"
-#include "IntArrayTag.h"
-
-#include <memory>
-#include <unordered_map>
+#include "Tag.h"
 
 class CompoundTag : public Tag {
 private:
diff --git a/targets/nbt/include/nbt/DoubleTag.h b/targets/nbt/include/nbt/DoubleTag.h
index 215786c33..327a41e4a 100644
--- a/targets/nbt/include/nbt/DoubleTag.h
+++ b/targets/nbt/include/nbt/DoubleTag.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "Tag.h"
+#include "java/InputOutputStream/InputOutputStream.h"
 
 class DoubleTag : public Tag {
 public:
diff --git a/targets/nbt/include/nbt/FloatTag.h b/targets/nbt/include/nbt/FloatTag.h
index 1d96901e5..ab7096d49 100644
--- a/targets/nbt/include/nbt/FloatTag.h
+++ b/targets/nbt/include/nbt/FloatTag.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "Tag.h"
+#include "java/InputOutputStream/InputOutputStream.h"
 
 class FloatTag : public Tag {
 public:
diff --git a/targets/nbt/include/nbt/ListTag.h b/targets/nbt/include/nbt/ListTag.h
index 073d7be8e..84308295a 100644
--- a/targets/nbt/include/nbt/ListTag.h
+++ b/targets/nbt/include/nbt/ListTag.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Tag.h"
-
+#include <cstring>
 #include <memory>
 #include <vector>
-#include <cstring>
+
+#include "Tag.h"
 
 template <class T>
 class ListTag : public Tag {
diff --git a/targets/nbt/include/nbt/Tag.h b/targets/nbt/include/nbt/Tag.h
index a044eab18..00c931864 100644
--- a/targets/nbt/include/nbt/Tag.h
+++ b/targets/nbt/include/nbt/Tag.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <ostream>
+
 #include "java/InputOutputStream/InputOutputStream.h"
 
 class Tag {
diff --git a/targets/nbt/src/NbtIo.cpp b/targets/nbt/src/NbtIo.cpp
index 2cae95c68..3f0a47f8a 100644
--- a/targets/nbt/src/NbtIo.cpp
+++ b/targets/nbt/src/NbtIo.cpp
@@ -1,6 +1,7 @@
-#include "java/InputOutputStream/InputOutputStream.h"
 #include "nbt/NbtIo.h"
 
+#include "java/InputOutputStream/InputOutputStream.h"
+
 CompoundTag* NbtIo::readCompressed(InputStream* in) {
     // 4J - this was using a try/finally block
     DataInputStream dis =
diff --git a/targets/nbt/src/Tag.cpp b/targets/nbt/src/Tag.cpp
index e5aca594a..7b7c6c435 100644
--- a/targets/nbt/src/Tag.cpp
+++ b/targets/nbt/src/Tag.cpp
@@ -1,17 +1,18 @@
+#include "nbt/Tag.h"
+
 #include <cstdio>
 
-#include "nbt/Tag.h"
-#include "nbt/EndTag.h"
-#include "nbt/ByteTag.h"
 #include "nbt/ByteArrayTag.h"
+#include "nbt/ByteTag.h"
+#include "nbt/CompoundTag.h"
 #include "nbt/DoubleTag.h"
+#include "nbt/EndTag.h"
 #include "nbt/FloatTag.h"
 #include "nbt/IntTag.h"
+#include "nbt/ListTag.h"
 #include "nbt/LongTag.h"
 #include "nbt/ShortTag.h"
 #include "nbt/StringTag.h"
-#include "nbt/ListTag.h"
-#include "nbt/CompoundTag.h"
 
 Tag::Tag(const std::wstring& name) {
     if (name.empty()) {
diff --git a/targets/platform/Platform.h b/targets/platform/Platform.h
index 47a2a51b8..8f8d3e586 100644
--- a/targets/platform/Platform.h
+++ b/targets/platform/Platform.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "PlatformTypes.h"
 #include "IPlatformInput.h"
 #include "IPlatformNetwork.h"
 #include "IPlatformProfile.h"
@@ -8,3 +7,4 @@
 #include "IPlatformSound.h"
 #include "IPlatformStorage.h"
 #include "IPlatformUIController.h"
+#include "PlatformTypes.h"
diff --git a/targets/platform/PlatformServices.cpp b/targets/platform/PlatformServices.cpp
index 497bb805f..d7e53c40b 100644
--- a/targets/platform/PlatformServices.cpp
+++ b/targets/platform/PlatformServices.cpp
@@ -1,4 +1,5 @@
 #include "PlatformServices.h"
+
 #include "../4J.Input/4J_Input.h"
 #include "../4J.Profile/4J_Profile.h"
 #include "../4J.Render/4J_Render.h"