diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index a7ba7b06a..b52457341 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -279,6 +279,19 @@ typedef XUID GameSessionUID;
 	#include "Windows64\Iggy\include\iggy.h"
 	#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
 	#include "Windows64\Windows64_UIController.h"
+#elif defined __linux__
+	#include "Windows64/Sentient/MinecraftTelemetry.h"
+	#include "Windows64Media/strings.h"
+	#include "Windows64/Windows64_App.h"
+	#include "Windows64/Sentient/DynamicConfigurations.h"
+	#include "Windows64/Sentient/SentientTelemetryCommon.h"
+	#include "Windows64/GameConfig/Minecraft.spa.h"
+	#include "Windows64/XML/ATGXmlParser.h"	
+	#include "Windows64/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "Windows64/Iggy/include/iggy.h"
+	#include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
+	#include "Windows64/Windows64_UIController.h"
 #elif defined __PSVITA__
 	#include "PSVita\PSVita_App.h"
 	#include "PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
diff --git a/Minecraft.World/Animal.cpp b/Minecraft.World/Animal.cpp
index 34c1670cc..c28d4bd4f 100644
--- a/Minecraft.World/Animal.cpp
+++ b/Minecraft.World/Animal.cpp
@@ -12,9 +12,6 @@
 #include "Random.h"
 #include "Animal.h"
 
-#include "../Minecraft.Client/Windows64Media/strings.h"
-
-
 Animal::Animal(Level *level) : AgableMob( level )
 {
 //	inLove = 0;										// 4J removed - now synched data
diff --git a/Minecraft.World/EnchantmentContainer.cpp b/Minecraft.World/EnchantmentContainer.cpp
index bdaa8bdcd..514fb9720 100644
--- a/Minecraft.World/EnchantmentContainer.cpp
+++ b/Minecraft.World/EnchantmentContainer.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "net.minecraft.world.inventory.h"
 #include "EnchantmentContainer.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 EnchantmentContainer::EnchantmentContainer(EnchantmentMenu *menu) : SimpleContainer(IDS_ENCHANT, 1), m_menu( menu )
 {
diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp
index e4bf95f44..d0677d38e 100644
--- a/Minecraft.World/EntityIO.cpp
+++ b/Minecraft.World/EntityIO.cpp
@@ -13,7 +13,6 @@
 #include "net.minecraft.world.level.h"
 #include "com.mojang.nbt.h"
 #include "EntityIO.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 unordered_map<wstring, entityCreateFn> *EntityIO::idCreateMap = new unordered_map<wstring, entityCreateFn>;
 unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq> *EntityIO::classIdMap = new unordered_map<eINSTANCEOF, wstring, eINSTANCEOFKeyHash, eINSTANCEOFKeyEq>;
diff --git a/Minecraft.World/FireChargeItem.cpp b/Minecraft.World/FireChargeItem.cpp
index c4e47b0ca..77d81cf00 100644
--- a/Minecraft.World/FireChargeItem.cpp
+++ b/Minecraft.World/FireChargeItem.cpp
@@ -6,7 +6,7 @@
 #include "net.minecraft.world.h"
 #include "SoundTypes.h"
 #include "FireChargeItem.h"
-#include "tile.h"
+#include "Tile.h"
 
 FireChargeItem::FireChargeItem(int id) : Item(id)
 {
diff --git a/Minecraft.World/Inventory.cpp b/Minecraft.World/Inventory.cpp
index 35d39c3ec..8ef3f085e 100644
--- a/Minecraft.World/Inventory.cpp
+++ b/Minecraft.World/Inventory.cpp
@@ -6,7 +6,6 @@
 #include "net.minecraft.stats.h"
 #include "Material.h"
 #include "Inventory.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 const int Inventory::POP_TIME_DURATION = 5;
 const int Inventory::MAX_INVENTORY_STACK_SIZE = 64;
diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp
index 8aa8ae792..68f480d8c 100644
--- a/Minecraft.World/Minecart.cpp
+++ b/Minecraft.World/Minecart.cpp
@@ -12,8 +12,6 @@
 #include "Minecart.h"
 #include "SharedConstants.h"
 
-#include "../Minecraft.Client/Windows64Media/strings.h"
-
 const int Minecart::EXITS[][2][3] = { //
 	//
 	{
diff --git a/Minecraft.World/MobEffect.cpp b/Minecraft.World/MobEffect.cpp
index d7d648b3d..54a1e1ed0 100644
--- a/Minecraft.World/MobEffect.cpp
+++ b/Minecraft.World/MobEffect.cpp
@@ -4,7 +4,6 @@
 #include "net.minecraft.world.food.h"
 #include "net.minecraft.world.effect.h"
 #include "SharedConstants.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 MobEffect *MobEffect::effects[NUM_EFFECTS];
 
diff --git a/Minecraft.World/PlayerEnderChestContainer.cpp b/Minecraft.World/PlayerEnderChestContainer.cpp
index b1095bfad..36cc82196 100644
--- a/Minecraft.World/PlayerEnderChestContainer.cpp
+++ b/Minecraft.World/PlayerEnderChestContainer.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.tile.entity.h"
 #include "PlayerEnderChestContainer.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 PlayerEnderChestContainer::PlayerEnderChestContainer() : SimpleContainer(IDS_TILE_ENDERCHEST, 9 * 3)
 {
diff --git a/Minecraft.World/RepairMenu.cpp b/Minecraft.World/RepairMenu.cpp
index 1655e7d16..be2280cc6 100644
--- a/Minecraft.World/RepairMenu.cpp
+++ b/Minecraft.World/RepairMenu.cpp
@@ -5,8 +5,6 @@
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.item.enchantment.h"
 #include "RepairMenu.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
-#include "../Minecraft.Client/Windows64/Windows64_App.h"
 
 RepairMenu::RepairMenu(shared_ptr<Inventory> inventory, Level *level, int xt, int yt, int zt, shared_ptr<Player> player)
 {
diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp
index 1bdeb5585..99d38a6c2 100644
--- a/Minecraft.World/Villager.cpp
+++ b/Minecraft.World/Villager.cpp
@@ -15,7 +15,6 @@
 #include "net.minecraft.world.level.h"
 #include "../Minecraft.Client/Textures.h"
 #include "Villager.h"
-#include "../Minecraft.Client/Windows64Media/strings.h"
 
 unordered_map<int, pair<int,int> > Villager::MIN_MAX_VALUES;
 unordered_map<int, pair<int,int> > Villager::MIN_MAX_PRICES;
diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h
index 943cc5a96..250c8a796 100644
--- a/Minecraft.World/stdafx.h
+++ b/Minecraft.World/stdafx.h
@@ -246,7 +246,10 @@ void MemSect(int sect);
 #include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h"
 #include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h"
 #elif defined(__linux__)
-// DecalOverdose: TODO????
+#include "../Minecraft.Client/Windows64/Windows64_App.h"
+#include "../Minecraft.Client/Windows64Media/strings.h"
+#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
 #else
 #include "..\Minecraft.Client\Orbis\Orbis_App.h"
 #include "..\Minecraft.Client\OrbisMedia\strings.h"