diff --git a/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp
index f5707cdef..45ccd8a38 100644
--- a/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Build/Common/Audio/SoundEngine.cpp
@@ -4,8 +4,8 @@
 #include "../Consoles_App.h"
 #include "../../../Player/MultiPlayerLocalPlayer.h"
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../../Minecraft.World/leveldata.h"
-#include "../../Minecraft.World/mth.h"
+#include "../../../../Minecraft.World/Level/LevelData.h"
+#include "../../Minecraft.World/Util/Mth.h"
 #include "../../../Textures/Packs/TexturePackRepository.h"
 #include "../../../Textures/Packs/DLCTexturePack.h"
 #include "../DLC/DLCAudioFile.h"
@@ -1676,4 +1676,4 @@ F32 AILCALLBACK custom_falloff_function (HSAMPLE   S,
 	return result;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Minecraft.Client/Platform/Linux/LinuxGL.cpp b/Minecraft.Client/Platform/Linux/LinuxGL.cpp
index d24f71947..431ef7cdd 100644
--- a/Minecraft.Client/Platform/Linux/LinuxGL.cpp
+++ b/Minecraft.Client/Platform/Linux/LinuxGL.cpp
@@ -4,9 +4,9 @@
 #include <GL/glu.h>
 #include <GL/glext.h>
 #include <dlfcn.h>
-#include "../../Minecraft.World/IntBuffer.h"
-#include "../../Minecraft.World/FloatBuffer.h"
-#include "../../Minecraft.World/ByteBuffer.h"
+#include "../../Minecraft.World/IO/Streams/IntBuffer.h"
+#include "../../Minecraft.World/IO/Streams/FloatBuffer.h"
+#include "../../Minecraft.World/IO/Streams/ByteBuffer.h"
 
 int glGenTextures()
 {
diff --git a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
index 3844e1deb..6f116f0b4 100644
--- a/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
+++ b/Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
@@ -5,14 +5,14 @@
 #include <string>
 #include <pthread.h>
 
-#include "../stubs.h"
-#include "../Common/Consoles_App.h"
+#include "Stubs/LinuxStubs.h"
+#include "../../Build/Common/Consoles_App.h"
 
 void Display::update() {}
 
 int CMinecraftApp::GetTPConfigVal(WCHAR* pwchDataFile) { return 0; }
 
-#include "../../Minecraft.World/x64headers/extraX64.h"
+#include "../../Minecraft.World/Build/x64headers/extraX64.h"
 
 void PIXSetMarkerDeprecated(int a, const char* b, ...) {}
 
diff --git a/Minecraft.Client/Rendering/glWrapper.cpp b/Minecraft.Client/Rendering/glWrapper.cpp
index 6134b7d45..d64e0cebb 100644
--- a/Minecraft.Client/Rendering/glWrapper.cpp
+++ b/Minecraft.Client/Rendering/glWrapper.cpp
@@ -392,4 +392,3 @@ void glCullFace(int dir)
 }
 
 #endif
-#endif
\ No newline at end of file