diff --git a/Minecraft.Client/Minecraft.h b/Minecraft.Client/Minecraft.h
index 1651bd5c6..39440f5ea 100644
--- a/Minecraft.Client/Minecraft.h
+++ b/Minecraft.Client/Minecraft.h
@@ -43,6 +43,10 @@ class PsPlusUpsellWrapper;
 #include "../Minecraft.World/Util/C4JThread.h"
 #include "Textures/ResourceLocation.h"
 
+#ifdef linux
+#undef linux
+#endif
+
 class Minecraft {
 private:
     enum OS { linux, solaris, windows, macos, unknown, xbox };
@@ -362,7 +366,7 @@ public:
 private:
     // A bit field that store whether a particular quadrant is in the full
     // tutorial or not
-    BYTE m_inFullTutorialBits;
+    uint8_t m_inFullTutorialBits;
 
 public:
     bool isTutorial();
diff --git a/Minecraft.Client/Rendering/Models/Model.h b/Minecraft.Client/Rendering/Models/Model.h
index 3bb2212cc..59190bdf1 100644
--- a/Minecraft.Client/Rendering/Models/Model.h
+++ b/Minecraft.Client/Rendering/Models/Model.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../../../Minecraft.World/Util/Random.h"
-#include "../Minecraft.Client/SkinBox.h"
+#include "SkinBox.h"
 class Mob;
 class ModelPart;
 class TexOffs;