diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h
index 76a6c5fa7..8553077f5 100644
--- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h
+++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h
@@ -3,12 +3,14 @@
 
 #include "LevelGenerators.h"
 #include "LevelRules.h"
+#include "../DLC/DLCGameRulesHeader.h"
+
 class LevelGenerationOptions;
 class RootGameRulesDefinition;
 class LevelChunk;
 class DLCPack;
 class DLCGameRulesFile;
-class DLCGameRulesHeader;
+// class DLCGameRulesHeader;
 class StringTable;
 class GameRuleDefinition;
 class DataInputStream;
diff --git a/Minecraft.Client/UI/SimpleIcon.cpp b/Minecraft.Client/UI/SimpleIcon.cpp
index a01014cb7..33d5b5057 100644
--- a/Minecraft.Client/UI/SimpleIcon.cpp
+++ b/Minecraft.Client/UI/SimpleIcon.cpp
@@ -1,11 +1,11 @@
-#pragma once
 #include "../Platform/stdafx.h"
-#include "../Textures/Stitching/StitchedTexture.h"
+#include "SimpleIcon.h"
 
-// 4J Added this class to store the uv data that we have pre-calculated and
-// loaded from a file
-class SimpleIcon : public StitchedTexture {
-public:
-    SimpleIcon(const std::wstring& name, const std::wstring& filename, float u0,
-               float v0, float u1, float v1);
-};
\ No newline at end of file
+SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename,
+                       float U0, float V0, float U1, float V1)
+    : StitchedTexture(name, filename) {
+    u0 = U0;
+    u1 = U1;
+    v0 = V0;
+    v1 = V1;
+}
diff --git a/Minecraft.Client/UI/SimpleIcon.h b/Minecraft.Client/UI/SimpleIcon.h
index 33d5b5057..a01014cb7 100644
--- a/Minecraft.Client/UI/SimpleIcon.h
+++ b/Minecraft.Client/UI/SimpleIcon.h
@@ -1,11 +1,11 @@
+#pragma once
 #include "../Platform/stdafx.h"
-#include "SimpleIcon.h"
+#include "../Textures/Stitching/StitchedTexture.h"
 
-SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename,
-                       float U0, float V0, float U1, float V1)
-    : StitchedTexture(name, filename) {
-    u0 = U0;
-    u1 = U1;
-    v0 = V0;
-    v1 = V1;
-}
+// 4J Added this class to store the uv data that we have pre-calculated and
+// loaded from a file
+class SimpleIcon : public StitchedTexture {
+public:
+    SimpleIcon(const std::wstring& name, const std::wstring& filename, float u0,
+               float v0, float u1, float v1);
+};
\ No newline at end of file
diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build
index 8e8f3e5e5..0a77a5197 100644
--- a/Minecraft.Client/meson.build
+++ b/Minecraft.Client/meson.build
@@ -4,7 +4,6 @@ exclude_sources = [
   ' ! -name "CreativeMode.cpp"',
   ' ! -name "GameMode.cpp"',
   ' ! -name "DemoMode.cpp"',
-  ' ! -name "PreStitchedTextureMap.cpp"',
 ]
 
 # all sources except ./Platform/*
diff --git a/Minecraft.World/meson.build b/Minecraft.World/meson.build
index 33629c503..539120d5f 100644
--- a/Minecraft.World/meson.build
+++ b/Minecraft.World/meson.build
@@ -11,6 +11,7 @@ exclude_sources = [
   '! -name ZonedChunkStorage.cpp',
   '! -name ZoneFile.cpp',
   '! -name ZoneIO.cpp',
+  '! -name LevelConflictException.cpp',
 ]
 
 # GET IT ALLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL