diff --git a/Minecraft.World/Animal.cpp b/Minecraft.World/Animal.cpp
index 45fc304f5..34c1670cc 100644
--- a/Minecraft.World/Animal.cpp
+++ b/Minecraft.World/Animal.cpp
@@ -12,6 +12,7 @@
 #include "Random.h"
 #include "Animal.h"
 
+#include "../Minecraft.Client/Windows64Media/strings.h"
 
 
 Animal::Animal(Level *level) : AgableMob( level )
diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp
index 0b2c24e4b..717e83322 100644
--- a/Minecraft.World/ArmorItem.cpp
+++ b/Minecraft.World/ArmorItem.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "net.minecraft.world.h"
 #include "net.minecraft.world.entity.player.h"
 #include "com.mojang.nbt.h"
diff --git a/Minecraft.World/Biome.cpp b/Minecraft.World/Biome.cpp
index d2f4cd1c1..711aec04d 100644
--- a/Minecraft.World/Biome.cpp
+++ b/Minecraft.World/Biome.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Color.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "net.minecraft.world.level.levelgen.feature.h"
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.level.h"
diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp
index b16efd311..656419647 100644
--- a/Minecraft.World/BiomeSource.cpp
+++ b/Minecraft.World/BiomeSource.cpp
@@ -5,8 +5,8 @@
 #include "net.minecraft.world.level.newbiome.layer.h"
 #include "System.h"
 #include "BiomeSource.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\ProgressRenderer.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/ProgressRenderer.h"
 
 // 4J - removal of separate temperature & downfall layers brought forward from 1.2.3
 void BiomeSource::_init()
diff --git a/Minecraft.World/Blaze.cpp b/Minecraft.World/Blaze.cpp
index 57726363a..a62148b97 100644
--- a/Minecraft.World/Blaze.cpp
+++ b/Minecraft.World/Blaze.cpp
@@ -7,7 +7,7 @@
 #include "net.minecraft.world.entity.h"
 #include "net.minecraft.world.entity.projectile.h"
 #include "SharedConstants.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "Blaze.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/BucketItem.cpp b/Minecraft.World/BucketItem.cpp
index d3570cd70..21749beed 100644
--- a/Minecraft.World/BucketItem.cpp
+++ b/Minecraft.World/BucketItem.cpp
@@ -12,9 +12,9 @@
 #include "Material.h"
 #include "ItemInstance.h"
 #include "BucketItem.h"
-#include "..\Minecraft.Client\LocalPlayer.h"
-#include "..\Minecraft.Client\ServerPlayer.h"
-#include "..\Minecraft.Client\PlayerConnection.h"
+#include "../Minecraft.Client/LocalPlayer.h"
+#include "../Minecraft.Client/ServerPlayer.h"
+#include "../Minecraft.Client/PlayerConnection.h"
 #include "..\Minecraft.World\ChatPacket.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/C4JThread.cpp b/Minecraft.World/C4JThread.cpp
index 4b9760c17..eb8f19cfc 100644
--- a/Minecraft.World/C4JThread.cpp
+++ b/Minecraft.World/C4JThread.cpp
@@ -3,8 +3,8 @@
 
 #include "C4JThread.h"
 #ifdef __PSVITA__
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\ShutdownManager.h"
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\PSVitaTLSStorage.h"
+#include "../Minecraft.Client/PSVita\PSVitaExtras\ShutdownManager.h"
+#include "../Minecraft.Client/PSVita\PSVitaExtras\PSVitaTLSStorage.h"
 
 // AP - this comes from the low level user_malloc.c file used to overide the default memory functions. These must be called when a thread is started/stopped
 extern "C" {
@@ -12,7 +12,7 @@ extern void user_registerthread();
 extern void user_removethread();
 }
 #else
-#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
+#include "../Minecraft.Client/PS3\PS3Extras\ShutdownManager.h"
 
 #endif
 
diff --git a/Minecraft.World/CauldronTile.cpp b/Minecraft.World/CauldronTile.cpp
index 4d5640ca0..8d45dc249 100644
--- a/Minecraft.World/CauldronTile.cpp
+++ b/Minecraft.World/CauldronTile.cpp
@@ -6,7 +6,7 @@
 #include "net.minecraft.world.entity.item.h"
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.world.h"
-#include "..\Minecraft.Client\ServerPlayer.h"
+#include "../Minecraft.Client/ServerPlayer.h"
 
 const wstring CauldronTile::TEXTURE_INSIDE = L"cauldron_inner";
 const wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom";
diff --git a/Minecraft.World/CaveSpider.cpp b/Minecraft.World/CaveSpider.cpp
index 5f7c6028e..b9a255db8 100644
--- a/Minecraft.World/CaveSpider.cpp
+++ b/Minecraft.World/CaveSpider.cpp
@@ -3,7 +3,7 @@
 #include "net.minecraft.world.effect.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "CaveSpider.h"
 
 
diff --git a/Minecraft.World/Chicken.cpp b/Minecraft.World/Chicken.cpp
index 0104b2bf9..ba08ce7fd 100644
--- a/Minecraft.World/Chicken.cpp
+++ b/Minecraft.World/Chicken.cpp
@@ -6,7 +6,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.item.h"
 #include "Chicken.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 #include "MobCategory.h"
 
diff --git a/Minecraft.World/ClockItem.cpp b/Minecraft.World/ClockItem.cpp
index afe0544d2..2f0ea4978 100644
--- a/Minecraft.World/ClockItem.cpp
+++ b/Minecraft.World/ClockItem.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ClockItem.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
 #include "net.minecraft.world.h"
 
 #ifdef __PSVITA__
diff --git a/Minecraft.World/CompassItem.cpp b/Minecraft.World/CompassItem.cpp
index 57ad65d04..f70828a3e 100644
--- a/Minecraft.World/CompassItem.cpp
+++ b/Minecraft.World/CompassItem.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "CompassItem.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
 #include "net.minecraft.world.h"
 
 #ifdef __PSVITA__
diff --git a/Minecraft.World/ConsoleSaveFileSplit.cpp b/Minecraft.World/ConsoleSaveFileSplit.cpp
index 2d83f217e..3077e2a3e 100644
--- a/Minecraft.World/ConsoleSaveFileSplit.cpp
+++ b/Minecraft.World/ConsoleSaveFileSplit.cpp
@@ -5,12 +5,12 @@
 #include "File.h"
 #include <xuiapp.h>
 #include "compression.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\MinecraftServer.h"
-#include "..\Minecraft.Client\ServerLevel.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/ServerLevel.h"
 #include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.Client\Common\GameRules\LevelGenerationOptions.h"
+#include "../Minecraft.Client/Common\GameRules\LevelGenerationOptions.h"
 #include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
 
 #define RESERVE_ALLOCATION  MEM_RESERVE
diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp
index 571900240..d67ab6195 100644
--- a/Minecraft.World/ContainerMenu.cpp
+++ b/Minecraft.World/ContainerMenu.cpp
@@ -3,9 +3,9 @@
 #include "net.minecraft.world.item.h"
 #include "Slot.h"
 #include "GenericStats.h"
-#include "..\Minecraft.Client\StatsCounter.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\LocalPlayer.h"
+#include "../Minecraft.Client/StatsCounter.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/LocalPlayer.h"
 #include "ContainerMenu.h"
 
 ContainerMenu::ContainerMenu(shared_ptr<Container> inventory, shared_ptr<Container> container) : AbstractContainerMenu()
diff --git a/Minecraft.World/ControlledByPlayerGoal.h b/Minecraft.World/ControlledByPlayerGoal.h
index f49eaaf18..119390819 100644
--- a/Minecraft.World/ControlledByPlayerGoal.h
+++ b/Minecraft.World/ControlledByPlayerGoal.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Goal.h"
-#include "..\Minecraft.World\SharedConstants.h"
+#include "SharedConstants.h"
 
 class Mob;
 
@@ -29,4 +29,4 @@ public:
 	bool isBoosting();
 	void boost();
 	bool canBoost();
-};
\ No newline at end of file
+};
diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp
index c259183ed..5a5beec7f 100644
--- a/Minecraft.World/Cow.cpp
+++ b/Minecraft.World/Cow.cpp
@@ -9,7 +9,7 @@
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.stats.h"
 #include "Cow.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "MobCategory.h"
 
 
diff --git a/Minecraft.World/Creeper.cpp b/Minecraft.World/Creeper.cpp
index 3f6c66a74..9d6b02e74 100644
--- a/Minecraft.World/Creeper.cpp
+++ b/Minecraft.World/Creeper.cpp
@@ -13,7 +13,7 @@
 #include "Skeleton.h"
 #include "Creeper.h"
 #include "Arrow.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/Dimension.cpp b/Minecraft.World/Dimension.cpp
index 35e66698b..ccc2fcc95 100644
--- a/Minecraft.World/Dimension.cpp
+++ b/Minecraft.World/Dimension.cpp
@@ -10,8 +10,8 @@
 #include "NormalDimension.h"
 #include "TheEndDimension.h"
 #include "net.minecraft.world.level.tile.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/Common\Colours\ColourTable.h"
 
 void Dimension::init(Level *level)
 {
diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp
index c9b51c844..97a5066f2 100644
--- a/Minecraft.World/DurangoStats.cpp
+++ b/Minecraft.World/DurangoStats.cpp
@@ -12,16 +12,16 @@
 #include "Item.h"
 #include "Level.h"
 
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "LevelData.h"
 #include "LevelSettings.h"
 
-#include "..\Minecraft.Client\LocalPlayer.h"
-#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
+#include "../Minecraft.Client/LocalPlayer.h"
+#include "../Minecraft.Client/MultiPlayerLocalPlayer.h"
 
 #include "EntityIO.h"
 
-#include "..\Minecraft.Client\Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
+#include "../Minecraft.Client/Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
 
 #include "DurangoStats.h"
 
diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp
index 2ccd453cd..2211cdeb2 100644
--- a/Minecraft.World/EnderDragon.cpp
+++ b/Minecraft.World/EnderDragon.cpp
@@ -7,12 +7,14 @@
 #include "net.minecraft.world.phys.h"
 #include "net.minecraft.world.damagesource.h"
 #include "BasicTypeContainers.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "net.minecraft.world.entity.boss.enderdragon.h"
 #include "net.minecraft.world.level.pathfinder.h"
 #include "SharedConstants.h"
 #include "EnderDragon.h"
 
+#include "../Minecraft.Client/Windows64/Windows64_App.h"
+
 #define PRINT_DRAGON_STATE_CHANGE_MESSAGES 1
 
 
diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp
index abfc5cb5b..c1d2c3e03 100644
--- a/Minecraft.World/EnderMan.cpp
+++ b/Minecraft.World/EnderMan.cpp
@@ -7,7 +7,7 @@
 #include "net.minecraft.world.damagesource.h"
 #include "net.minecraft.world.phys.h"
 #include "com.mojang.nbt.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "EnderMan.h"
 
 
diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp
index 853ac888f..4841e697c 100644
--- a/Minecraft.World/Entity.cpp
+++ b/Minecraft.World/Entity.cpp
@@ -50,8 +50,8 @@ int Entity::getSmallId()
 #ifdef _WIN32
 	if( ((size_t)TlsGetValue(tlsIdx) != 0 ) )
 #else
-	pthread_key_create(&tlsKey, nullptr);
-	if ( ((size_t)pthread_getspecific(tlsKey) != 0) )
+	pthread_key_create(&tlsIdx, nullptr);
+	if ( ((size_t)pthread_getspecific(tlsIdx) != 0) )
 #endif
 	{
 		MinecraftServer *server = MinecraftServer::getInstance();
@@ -154,7 +154,7 @@ void Entity::freeSmallId(int index)
 
 void Entity::useSmallIds()
 {
-	TlsSetValue(tlsIdx,(LPVOID)1);
+	pthread_setspecific(tlsIdx,(LPVOID)1);
 }
 
 // Things also added here to be able to manage the concept of a number of extra "wandering" entities - normally path finding entities aren't allowed to
diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp
index 60f062dbe..22cb51881 100644
--- a/Minecraft.World/FireTile.cpp
+++ b/Minecraft.World/FireTile.cpp
@@ -5,12 +5,12 @@
 #include "net.minecraft.world.level.tile.h"
 #include "FireTile.h"
 #include "SoundTypes.h"
-#include "..\Minecraft.Client\MinecraftServer.h"
-#include "..\Minecraft.Client\PlayerList.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/PlayerList.h"
 
 // AP - added for Vita to set Alpha Cut out
 #include "IntBuffer.h"
-#include "..\Minecraft.Client\Tesselator.h"
+#include "../Minecraft.Client/Tesselator.h"
 
 
 const wstring FireTile::TEXTURE_FIRST = L"fire_0";
diff --git a/Minecraft.World/FoliageColor.cpp b/Minecraft.World/FoliageColor.cpp
index 276bf9298..e8525ed8e 100644
--- a/Minecraft.World/FoliageColor.cpp
+++ b/Minecraft.World/FoliageColor.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "FoliageColor.h"
 
 // 4J Stu - Don't use this any more
diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp
index fcf0b705e..cc41dbf79 100644
--- a/Minecraft.World/Ghast.cpp
+++ b/Minecraft.World/Ghast.cpp
@@ -9,7 +9,7 @@
 #include "net.minecraft.world.damagesource.h"
 #include "net.minecraft.stats.h"
 #include "Ghast.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "LevelEvent.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/Giant.cpp b/Minecraft.World/Giant.cpp
index 054394da3..96d3be18c 100644
--- a/Minecraft.World/Giant.cpp
+++ b/Minecraft.World/Giant.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "net.minecraft.world.level.h"
 #include "Giant.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 
 
 
diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp
index 0e9550254..bf6c95048 100644
--- a/Minecraft.World/GrassTile.cpp
+++ b/Minecraft.World/GrassTile.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "GrassTile.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.biome.h"
@@ -8,7 +8,7 @@
 
 // AP - included for PSVita Alpha cut out optimisation
 #include "IntBuffer.h"
-#include "..\Minecraft.Client\Tesselator.h"
+#include "../Minecraft.Client/Tesselator.h"
 
 GrassTile::GrassTile(int id) : Tile(id, Material::grass)
 {
diff --git a/Minecraft.World/HellDimension.cpp b/Minecraft.World/HellDimension.cpp
index 85e2a25ae..7a033507f 100644
--- a/Minecraft.World/HellDimension.cpp
+++ b/Minecraft.World/HellDimension.cpp
@@ -5,8 +5,8 @@
 #include "net.minecraft.world.level.levelgen.h"
 #include "net.minecraft.world.level.biome.h"
 #include "net.minecraft.world.level.tile.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/Common\Colours\ColourTable.h"
 
 void HellDimension::init()
 {
diff --git a/Minecraft.World/LavaSlime.cpp b/Minecraft.World/LavaSlime.cpp
index 3ab32d908..29df25255 100644
--- a/Minecraft.World/LavaSlime.cpp
+++ b/Minecraft.World/LavaSlime.cpp
@@ -2,7 +2,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.h"
 #include "net.minecraft.world.item.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "LavaSlime.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/Layer.cpp b/Minecraft.World/Layer.cpp
index 1d010e722..827c11633 100644
--- a/Minecraft.World/Layer.cpp
+++ b/Minecraft.World/Layer.cpp
@@ -5,7 +5,7 @@
 
 #ifdef __PSVITA__
 // AP - this is used to perform fast 64bit divides of known values
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\libdivide.h"
+#include "../Minecraft.Client/PSVita\PSVitaExtras\libdivide.h"
 
 libdivide::divider<long long> fast_d2(2);
 libdivide::divider<long long> fast_d3(3);
diff --git a/Minecraft.World/LeafTile.cpp b/Minecraft.World/LeafTile.cpp
index 8b7d381c9..453ed48fc 100644
--- a/Minecraft.World/LeafTile.cpp
+++ b/Minecraft.World/LeafTile.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "LeafTile.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.biome.h"
diff --git a/Minecraft.World/Level.cpp b/Minecraft.World/Level.cpp
index 4b6a64f57..493569674 100644
--- a/Minecraft.World/Level.cpp
+++ b/Minecraft.World/Level.cpp
@@ -32,15 +32,15 @@
 
 #include "ConsoleSaveFile.h"
 #include <xuiapp.h>
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\LevelRenderer.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/LevelRenderer.h"
 #include "SoundTypes.h"
 #include "SparseLightStorage.h"
-#include "..\Minecraft.Client\Textures.h"
-#include "..\Minecraft.Client\TexturePackRepository.h"
-#include "..\Minecraft.Client\DLCTexturePack.h"
-#include "..\Minecraft.Client\Common\DLC\DLCPack.h"
-#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
+#include "../Minecraft.Client/Textures.h"
+#include "../Minecraft.Client/TexturePackRepository.h"
+#include "../Minecraft.Client/DLCTexturePack.h"
+#include "../Minecraft.Client/Common\DLC\DLCPack.h"
+#include "../Minecraft.Client/PS3\PS3Extras\ShutdownManager.h"
 
 
 DWORD Level::tlsIdx = TlsAlloc();
diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp
index 823c7c4cd..9b36ec3a6 100644
--- a/Minecraft.World/LevelChunk.cpp
+++ b/Minecraft.World/LevelChunk.cpp
@@ -11,10 +11,10 @@
 #include "SparseLightStorage.h"
 #include "BlockReplacements.h"
 #include "LevelChunk.h"
-#include "..\Minecraft.Client\MinecraftServer.h"
-#include "..\Minecraft.Client\ServerLevel.h"
-#include "..\Minecraft.Client\ServerChunkCache.h"
-#include "..\Minecraft.Client\GameRenderer.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/ServerLevel.h"
+#include "../Minecraft.Client/ServerChunkCache.h"
+#include "../Minecraft.Client/GameRenderer.h"
 
 #ifdef __PS3__
 #include "C4JSpursJob.h"
diff --git a/Minecraft.World/LightningBolt.cpp b/Minecraft.World/LightningBolt.cpp
index 901bedf11..bdcc17f03 100644
--- a/Minecraft.World/LightningBolt.cpp
+++ b/Minecraft.World/LightningBolt.cpp
@@ -4,8 +4,8 @@
 #include "net.minecraft.world.phys.h"
 #include "LightningBolt.h"
 #include "SoundTypes.h"
-#include "..\Minecraft.Client\MinecraftServer.h"
-#include "..\Minecraft.Client\PlayerList.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/PlayerList.h"
 #include "net.minecraft.world.level.dimension.h"
 
 
diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp
index d69a7f532..df2a9ddec 100644
--- a/Minecraft.World/MapItemSavedData.cpp
+++ b/Minecraft.World/MapItemSavedData.cpp
@@ -3,12 +3,12 @@
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.world.item.h"
 #include "MapItemSavedData.h"
-#include "..\Minecraft.Client\PlayerList.h"
-#include "..\Minecraft.Client\MinecraftServer.h"
-#include "..\Minecraft.Client\ServerPlayer.h"
+#include "../Minecraft.Client/PlayerList.h"
+#include "../Minecraft.Client/MinecraftServer.h"
+#include "../Minecraft.Client/ServerPlayer.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.storage.h"
-#include "..\Minecraft.Client\PlayerConnection.h"
+#include "../Minecraft.Client/PlayerConnection.h"
 
 const int MapItemSavedData::END_PORTAL_DECORATION_KEY = -1;
 
diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp
index 2b8fbb95a..8aa8ae792 100644
--- a/Minecraft.World/Minecart.cpp
+++ b/Minecraft.World/Minecart.cpp
@@ -12,7 +12,7 @@
 #include "Minecart.h"
 #include "SharedConstants.h"
 
-
+#include "../Minecraft.Client/Windows64Media/strings.h"
 
 const int Minecart::EXITS[][2][3] = { //
 	//
@@ -1208,4 +1208,4 @@ void Minecart::setHurtDir(int hurtDir)
 int Minecart::getHurtDir()
 {
 	return entityData->getInteger(DATA_ID_HURTDIR);
-}
\ No newline at end of file
+}
diff --git a/Minecraft.World/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp
index d2b4f6fda..31e333748 100644
--- a/Minecraft.World/MobSpawner.cpp
+++ b/Minecraft.World/MobSpawner.cpp
@@ -14,7 +14,7 @@
 #include "Level.h"
 #include "ChunkPos.h"
 #include "TilePos.h"
-#include "..\Minecraft.Client\ServerLevel.h"
+#include "../Minecraft.Client/ServerLevel.h"
 #include "MobSpawner.h"
 #include "Dimension.h"
 
diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp
index 627ce8d1e..f552089c0 100644
--- a/Minecraft.World/Monster.cpp
+++ b/Minecraft.World/Monster.cpp
@@ -8,7 +8,7 @@
 #include "net.minecraft.world.item.enchantment.h"
 #include "Monster.h"
 
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 
 
 
diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp
index a29700338..47e18a910 100644
--- a/Minecraft.World/MonsterPlacerItem.cpp
+++ b/Minecraft.World/MonsterPlacerItem.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "net.minecraft.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
diff --git a/Minecraft.World/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp
index a2aef158c..be8b007ad 100644
--- a/Minecraft.World/MushroomCow.cpp
+++ b/Minecraft.World/MushroomCow.cpp
@@ -4,7 +4,7 @@
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.world.entity.item.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "MushroomCow.h"
 #include "MobCategory.h"
 #include "AABB.h"
diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp
index 3c05f3578..a57917e0c 100644
--- a/Minecraft.World/Ozelot.cpp
+++ b/Minecraft.World/Ozelot.cpp
@@ -12,7 +12,7 @@
 #include "net.minecraft.world.phys.h"
 #include "SynchedEntityData.h"
 #include "StringHelpers.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "GenericStats.h"
 #include "Ozelot.h"
 
diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp
index b556a9365..a3d5f9348 100644
--- a/Minecraft.World/Pig.cpp
+++ b/Minecraft.World/Pig.cpp
@@ -13,7 +13,7 @@
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.world.entity.global.h"
 #include "Pig.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "MobCategory.h"
 
 
diff --git a/Minecraft.World/PigZombie.cpp b/Minecraft.World/PigZombie.cpp
index cc060484c..d1eae8b12 100644
--- a/Minecraft.World/PigZombie.cpp
+++ b/Minecraft.World/PigZombie.cpp
@@ -9,7 +9,7 @@
 #include "net.minecraft.world.entity.item.h"
 #include "net.minecraft.world.damagesource.h"
 #include "PigZombie.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp
index cbad5cecd..0c978d4f3 100644
--- a/Minecraft.World/PistonBaseTile.cpp
+++ b/Minecraft.World/PistonBaseTile.cpp
@@ -5,8 +5,8 @@
 #include "PistonExtensionTile.h"
 #include "Facing.h"
 #include "net.minecraft.world.level.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\MultiPlayerLevel.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/MultiPlayerLevel.h"
 #include "net.minecraft.world.h"
 #include "LevelChunk.h"
 #include "Dimension.h"
diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp
index 05d977431..3883c9e92 100644
--- a/Minecraft.World/Player.cpp
+++ b/Minecraft.World/Player.cpp
@@ -33,10 +33,10 @@
 #include "Player.h"
 #include "ParticleTypes.h"
 
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 
-#include "..\Minecraft.Client\LocalPlayer.h"
-#include "..\Minecraft.Client\HumanoidModel.h"
+#include "../Minecraft.Client/LocalPlayer.h"
+#include "../Minecraft.Client/HumanoidModel.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/PotionBrewing.cpp b/Minecraft.World/PotionBrewing.cpp
index eb9736558..72a29bbed 100644
--- a/Minecraft.World/PotionBrewing.cpp
+++ b/Minecraft.World/PotionBrewing.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "net.minecraft.world.effect.h"
 #include "JavaMath.h"
 #include "SharedConstants.h"
diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp
index 4e26134a1..048690466 100644
--- a/Minecraft.World/RandomLevelSource.cpp
+++ b/Minecraft.World/RandomLevelSource.cpp
@@ -10,7 +10,7 @@
 #include "RandomLevelSource.h"
 
 #ifdef __PS3__
-#include "..\Minecraft.Client\PS3\SPU_Tasks\PerlinNoise\PerlinNoiseJob.h"
+#include "../Minecraft.Client/PS3\SPU_Tasks\PerlinNoise\PerlinNoiseJob.h"
 #include "C4JSpursJob.h"
 static PerlinNoise_DataIn g_lperlinNoise1_SPU __attribute__((__aligned__(16)));
 static PerlinNoise_DataIn g_lperlinNoise2_SPU __attribute__((__aligned__(16)));
diff --git a/Minecraft.World/RedStoneDustTile.cpp b/Minecraft.World/RedStoneDustTile.cpp
index 699cad955..0e458e8c6 100644
--- a/Minecraft.World/RedStoneDustTile.cpp
+++ b/Minecraft.World/RedStoneDustTile.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "RedStoneDustTile.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.level.h"
@@ -9,7 +9,7 @@
 
 // AP - added for Vita to set Alpha Cut out
 #include "IntBuffer.h"
-#include "..\Minecraft.Client\Tesselator.h"
+#include "../Minecraft.Client/Tesselator.h"
 
 const wstring RedStoneDustTile::TEXTURE_CROSS = L"redstoneDust_cross";
 const wstring RedStoneDustTile::TEXTURE_LINE = L"redstoneDust_line";
diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp
index 30eeefcdb..2f97a4bac 100644
--- a/Minecraft.World/Sheep.cpp
+++ b/Minecraft.World/Sheep.cpp
@@ -16,7 +16,7 @@ using namespace std;
 #include "net.minecraft.world.entity.global.h"
 #include "net.minecraft.world.entity.player.h"
 #include "Sheep.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "MobCategory.h"
 #include "GenericStats.h"
 
diff --git a/Minecraft.World/SignTileEntity.cpp b/Minecraft.World/SignTileEntity.cpp
index 09b8e0222..076a181dc 100644
--- a/Minecraft.World/SignTileEntity.cpp
+++ b/Minecraft.World/SignTileEntity.cpp
@@ -9,9 +9,9 @@
 #include "net.minecraft.network.packet.h"
 #include "SignTileEntity.h"
 #include <xuiapp.h>
-#include "..\Minecraft.Client\ClientConnection.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\ServerLevel.h"
+#include "../Minecraft.Client/ClientConnection.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/ServerLevel.h"
 #include "..\Minecraft.World\Level.h"
 
 
diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp
index 117dc41b3..c0104d68b 100644
--- a/Minecraft.World/Silverfish.cpp
+++ b/Minecraft.World/Silverfish.cpp
@@ -4,7 +4,7 @@
 #include "net.minecraft.world.phys.h"
 #include "net.minecraft.world.damagesource.h"
 #include "net.minecraft.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "Silverfish.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/Skeleton.cpp b/Minecraft.World/Skeleton.cpp
index b6dbab1f1..0eef16bf6 100644
--- a/Minecraft.World/Skeleton.cpp
+++ b/Minecraft.World/Skeleton.cpp
@@ -13,7 +13,7 @@
 #include "net.minecraft.world.damagesource.h"
 #include "SharedConstants.h"
 #include "Skeleton.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp
index 7941fbe0b..f28e5ead3 100644
--- a/Minecraft.World/Slime.cpp
+++ b/Minecraft.World/Slime.cpp
@@ -11,7 +11,7 @@
 #include "net.minecraft.world.damagesource.h"
 #include "com.mojang.nbt.h"
 #include "Slime.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/SnowMan.cpp b/Minecraft.World/SnowMan.cpp
index 958b8126a..9ad728eec 100644
--- a/Minecraft.World/SnowMan.cpp
+++ b/Minecraft.World/SnowMan.cpp
@@ -11,7 +11,7 @@
 #include "net.minecraft.world.level.biome.h"
 #include "net.minecraft.world.item.h"
 #include "SharedConstants.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SnowMan.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/Spider.cpp b/Minecraft.World/Spider.cpp
index ba58ce54b..eacc6cc29 100644
--- a/Minecraft.World/Spider.cpp
+++ b/Minecraft.World/Spider.cpp
@@ -8,7 +8,7 @@
 #include "net.minecraft.world.entity.h"
 #include "com.mojang.nbt.h"
 #include "Spider.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/Squid.cpp b/Minecraft.World/Squid.cpp
index 3e36777c2..583583d89 100644
--- a/Minecraft.World/Squid.cpp
+++ b/Minecraft.World/Squid.cpp
@@ -8,7 +8,7 @@ using namespace std;
 #include "net.minecraft.world.item.h"
 #include "SharedConstants.h"
 #include "Squid.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 
 
 
diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp
index 15c412eb0..0c73efbfb 100644
--- a/Minecraft.World/StemTile.cpp
+++ b/Minecraft.World/StemTile.cpp
@@ -3,8 +3,8 @@
 #include "net.minecraft.world.entity.item.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/Common\Colours\ColourTable.h"
 #include "StemTile.h"
 
 const wstring StemTile::TEXTURE_ANGLED = L"stem_bent";
diff --git a/Minecraft.World/TallGrass.cpp b/Minecraft.World/TallGrass.cpp
index e2e7cb19d..a3bdf4e83 100644
--- a/Minecraft.World/TallGrass.cpp
+++ b/Minecraft.World/TallGrass.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.biome.h"
diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp
index ccc8641b4..47b4d571f 100644
--- a/Minecraft.World/TheEndDimension.cpp
+++ b/Minecraft.World/TheEndDimension.cpp
@@ -4,8 +4,8 @@
 #include "net.minecraft.world.level.levelgen.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
-#include "..\Minecraft.Client\Minecraft.h"
-#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Minecraft.h"
+#include "../Minecraft.Client/Common\Colours\ColourTable.h"
 
 void TheEndDimension::init()
 {
diff --git a/Minecraft.World/ThrownEnderpearl.cpp b/Minecraft.World/ThrownEnderpearl.cpp
index 1cddfb1fe..fda4a7ad9 100644
--- a/Minecraft.World/ThrownEnderpearl.cpp
+++ b/Minecraft.World/ThrownEnderpearl.cpp
@@ -3,8 +3,8 @@
 #include "net.minecraft.world.damagesource.h"
 #include "net.minecraft.world.entity.h"
 #include "net.minecraft.world.level.h"
-#include "..\Minecraft.Client\ServerPlayer.h"
-#include "..\Minecraft.Client\PlayerConnection.h"
+#include "../Minecraft.Client/ServerPlayer.h"
+#include "../Minecraft.Client/PlayerConnection.h"
 #include "ThrownEnderpearl.h"
 
 
diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp
index 328c0c708..99d38a6c2 100644
--- a/Minecraft.World/Villager.cpp
+++ b/Minecraft.World/Villager.cpp
@@ -13,7 +13,7 @@
 #include "net.minecraft.world.item.trading.h"
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.level.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "Villager.h"
 
 unordered_map<int, pair<int,int> > Villager::MIN_MAX_VALUES;
diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp
index a0f054721..1947bf377 100644
--- a/Minecraft.World/VillagerGolem.cpp
+++ b/Minecraft.World/VillagerGolem.cpp
@@ -13,7 +13,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.phys.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SynchedEntityData.h"
 #include "VillagerGolem.h"
 #include "ParticleTypes.h"
diff --git a/Minecraft.World/WaterLilyTile.cpp b/Minecraft.World/WaterLilyTile.cpp
index 912039224..e35f84d46 100644
--- a/Minecraft.World/WaterLilyTile.cpp
+++ b/Minecraft.World/WaterLilyTile.cpp
@@ -2,7 +2,7 @@
 #include "WaterLilyTile.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.entity.item.h"
-#include "..\Minecraft.Client\Minecraft.h"
+#include "../Minecraft.Client/Minecraft.h"
 #include "AABB.h"
 
 WaterlilyTile::WaterlilyTile(int id) : Bush(id)
diff --git a/Minecraft.World/Wolf.cpp b/Minecraft.World/Wolf.cpp
index 8ffc45c69..5b62d7411 100644
--- a/Minecraft.World/Wolf.cpp
+++ b/Minecraft.World/Wolf.cpp
@@ -15,7 +15,7 @@
 #include "net.minecraft.stats.h"
 #include "Sheep.h"
 #include "Wolf.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "SoundTypes.h"
 
 
diff --git a/Minecraft.World/Zombie.cpp b/Minecraft.World/Zombie.cpp
index b167635fe..d58c998a1 100644
--- a/Minecraft.World/Zombie.cpp
+++ b/Minecraft.World/Zombie.cpp
@@ -11,7 +11,7 @@
 #include "net.minecraft.world.entity.player.h"
 #include "Zombie.h"
 #include "GenericStats.h"
-#include "..\Minecraft.Client\Textures.h"
+#include "../Minecraft.Client/Textures.h"
 #include "net.minecraft.world.entity.h"
 #include "SoundTypes.h"
 
diff --git a/Minecraft.World/compression.cpp b/Minecraft.World/compression.cpp
index f7315f0bd..60a4ec70c 100644
--- a/Minecraft.World/compression.cpp
+++ b/Minecraft.World/compression.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "compression.h"
 #if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64
-#include "..\Minecraft.Client\Common\zlib\zlib.h"
+#include "../Minecraft.Client/Common\zlib\zlib.h"
 #endif
 
 #if defined(__linux__)
@@ -10,9 +10,9 @@
 #endif // __linux__
 
 #if defined __PSVITA__
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\zlib.h"
+#include "../Minecraft.Client/PSVita\PSVitaExtras\zlib.h"
 #elif defined __PS3__
-#include "..\Minecraft.Client\PS3\PS3Extras\EdgeZLib.h"
+#include "../Minecraft.Client/PS3\PS3Extras\EdgeZLib.h"
 #endif //__PS3__
 
 #if defined(__linux__)