diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp
index 21a64746d..7eeae4e8a 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp	
@@ -1,5 +1,6 @@
 #include "Minecraft.Client/Header Files/stdafx.h"
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "UIScene_Credits.h"
 
 #define CREDIT_ICON -2
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h
index f04da2b6b..fd8de0fc4 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h	
@@ -2,6 +2,9 @@
 
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
+#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
+#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h"
+#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
 
 class AbstractContainerMenu;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h
index e5e0dc012..7b71ea3b7 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h	
@@ -2,6 +2,7 @@
 
 #include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h"
+#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h"
 
 class InventoryMenu;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp
index b76faf0bd..c2853e6d0 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
@@ -15,6 +15,8 @@
 #include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"
 
+#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000)  // 1 second
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h
index 800289735..1a2bdd5ce 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h	
@@ -3,6 +3,7 @@
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
 #include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
 #include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
+#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h"
 
 #define CRAFTING_INVENTORY_SLOT_START 0
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h
index c69db8f10..b7eacd9b1 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h	
@@ -13,33 +13,8 @@
 #include <vector>
 
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h"
-#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h"
-#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
 
@@ -47,6 +22,7 @@ class ItemRenderer;
 class UILayer;
 class ItemInstance;
 class UIControl;
+class UIControl_Base;
 
 // 4J Stu - Setup some defines for quickly mapping elements in the scene
 
diff --git a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
index 42851b69d..a800e1c8d 100644
--- a/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
+++ b/minecraft/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c
@@ -1,5 +1,7 @@
 #define GDRAW_ASSERTS
 
+#include <stdbool.h>
+
 #include "gdraw.h"
 
 #include <GL/gl.h>
@@ -9,14 +11,10 @@
 #include <dlfcn.h>
 #include <stddef.h>
 
-#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
 #include "SDL_video.h"
-#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl"
+#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 
-#define true 1
-#define false 0
-
 #ifndef _ENABLEIGGY
 void* IggyGDrawMallocAnnotated(SINTa size, const char* file, int line) {
     (void)file;
diff --git a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
index 0f4e622e2..e7131fdce 100644
--- a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
+++ b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.Client/Header Files/stdafx.h"  // 4J
+#include "Minecraft.World/Header Files/stdafx.h"  // 4J
 
 // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools
 //
@@ -43,8 +43,8 @@
 
 #include <windows.h>
 #include <d3d11.h>
-#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h"
-#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
+#include "../include/gdraw.h"
+#include "../include/iggy.h"
 #include <string.h>
 #include <math.h>
 
diff --git a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl
index 43ece64b1..415f3f695 100644
--- a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl
+++ b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl
@@ -9,6 +9,8 @@
 #include <assert.h>
 #endif
 
+#include <stdbool.h>
+
 #if !defined(GDRAW_MAYBE_UNUSED)
 #define GDRAW_MAYBE_UNUSED
 #endif