diff --git a/CMakeLists.txt b/CMakeLists.txt
index f179ef3f7..825cdbab3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,4 +229,4 @@ elseif(BACKEND STREQUAL "Cross64")
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftClientCross64)
 else()
   message(FATAL_ERROR "Invalid Backend.")
-endif()
+endif()
\ No newline at end of file
diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp
index 7789c52b7..048c76ae7 100644
--- a/Minecraft.Client/AbstractContainerScreen.cpp
+++ b/Minecraft.Client/AbstractContainerScreen.cpp
@@ -6,9 +6,9 @@
 #include "GameMode.h"
 #include "KeyMapping.h"
 #include "Options.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 
 ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer();
 
diff --git a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
index 930e1596c..5e4b888b1 100644
--- a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
+++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.core.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.core.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "AbstractProjectileDispenseBehavior.h"
 
 shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed)
diff --git a/Minecraft.Client/AbstractProjectileDispenseBehavior.h b/Minecraft.Client/AbstractProjectileDispenseBehavior.h
index 93c6a6421..30705a8a0 100644
--- a/Minecraft.Client/AbstractProjectileDispenseBehavior.h
+++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Minecraft.World/DefaultDispenseItemBehavior.h>
+#include "..\Minecraft.World\DefaultDispenseItemBehavior.h"
 
 class Projectile;
 
diff --git a/Minecraft.Client/AbstractTexturePack.cpp b/Minecraft.Client/AbstractTexturePack.cpp
index 5ff2dda07..80799a4c5 100644
--- a/Minecraft.Client/AbstractTexturePack.cpp
+++ b/Minecraft.Client/AbstractTexturePack.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "Textures.h"
 #include "AbstractTexturePack.h"
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\InputOutputStream.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
 {
diff --git a/Minecraft.Client/AchievementPopup.cpp b/Minecraft.Client/AchievementPopup.cpp
index e0c0e4a9e..04f822aba 100644
--- a/Minecraft.Client/AchievementPopup.cpp
+++ b/Minecraft.Client/AchievementPopup.cpp
@@ -4,10 +4,10 @@
 #include "Font.h"
 #include "Textures.h"
 #include "Lighting.h"
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/SharedConstants.h>
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\SharedConstants.h"
 
 AchievementPopup::AchievementPopup(Minecraft *mc)
 {
diff --git a/Minecraft.Client/AchievementScreen.cpp b/Minecraft.Client/AchievementScreen.cpp
index e5dc8d725..26f203262 100644
--- a/Minecraft.Client/AchievementScreen.cpp
+++ b/Minecraft.Client/AchievementScreen.cpp
@@ -8,10 +8,10 @@
 #include "Textures.h"
 #include "StatsCounter.h"
 #include "ItemRenderer.h"
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 
 
diff --git a/Minecraft.Client/AchievementScreen.h b/Minecraft.Client/AchievementScreen.h
index a3fd00cba..3c4412e35 100644
--- a/Minecraft.Client/AchievementScreen.h
+++ b/Minecraft.Client/AchievementScreen.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Screen.h"
-#include <Minecraft.World/net.minecraft.stats.h>
+#include "..\Minecraft.World\net.minecraft.stats.h"
 class StatsCounter;
 
 class AchievementScreen : public Screen
diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp
index 11dd25888..642471a47 100644
--- a/Minecraft.Client/ArchiveFile.cpp
+++ b/Minecraft.Client/ArchiveFile.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/compression.h>
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\compression.h"
 
 #include "ArchiveFile.h"
 
diff --git a/Minecraft.Client/ArchiveFile.h b/Minecraft.Client/ArchiveFile.h
index 585374a46..722d570d8 100644
--- a/Minecraft.Client/ArchiveFile.h
+++ b/Minecraft.Client/ArchiveFile.h
@@ -3,8 +3,8 @@
 #include <vector>
 #include <unordered_map>
 
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\ArrayWithLength.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/ArrowRenderer.cpp b/Minecraft.Client/ArrowRenderer.cpp
index decb7f86c..4698cd6e3 100644
--- a/Minecraft.Client/ArrowRenderer.cpp
+++ b/Minecraft.Client/ArrowRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ArrowRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS);
 
diff --git a/Minecraft.Client/BatModel.cpp b/Minecraft.Client/BatModel.cpp
index d474dae12..ec582fef3 100644
--- a/Minecraft.Client/BatModel.cpp
+++ b/Minecraft.Client/BatModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.ambient.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
 #include "BatModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/BatRenderer.cpp b/Minecraft.Client/BatRenderer.cpp
index 850783d85..629fe014a 100644
--- a/Minecraft.Client/BatRenderer.cpp
+++ b/Minecraft.Client/BatRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.ambient.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
 #include "BatRenderer.h"
 #include "BatModel.h"
 
diff --git a/Minecraft.Client/BeaconRenderer.cpp b/Minecraft.Client/BeaconRenderer.cpp
index 2739b597f..959df6a89 100644
--- a/Minecraft.Client/BeaconRenderer.cpp
+++ b/Minecraft.Client/BeaconRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "BeaconRenderer.h"
 #include "Tesselator.h"
 
diff --git a/Minecraft.Client/BlazeModel.cpp b/Minecraft.Client/BlazeModel.cpp
index 3d3623672..68d9ef467 100644
--- a/Minecraft.Client/BlazeModel.cpp
+++ b/Minecraft.Client/BlazeModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "BlazeModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/BlazeRenderer.cpp b/Minecraft.Client/BlazeRenderer.cpp
index 4ca0e2c21..8e0da036b 100644
--- a/Minecraft.Client/BlazeRenderer.cpp
+++ b/Minecraft.Client/BlazeRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BlazeModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "BlazeRenderer.h"
 
 ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);
diff --git a/Minecraft.Client/BoatRenderer.cpp b/Minecraft.Client/BoatRenderer.cpp
index 0af9fe1f4..4c2e9baf9 100644
--- a/Minecraft.Client/BoatRenderer.cpp
+++ b/Minecraft.Client/BoatRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "BoatRenderer.h"
 #include "BoatModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);
 
diff --git a/Minecraft.Client/BookModel.cpp b/Minecraft.Client/BookModel.cpp
index aa4cee8c2..d032a7f5f 100644
--- a/Minecraft.Client/BookModel.cpp
+++ b/Minecraft.Client/BookModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "BookModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/BossMobGuiInfo.cpp b/Minecraft.Client/BossMobGuiInfo.cpp
index 9b9b700ef..1cc3cae86 100644
--- a/Minecraft.Client/BossMobGuiInfo.cpp
+++ b/Minecraft.Client/BossMobGuiInfo.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BossMobGuiInfo.h"
-#include <Minecraft.World/BossMob.h>
+#include "../Minecraft.World/BossMob.h"
 
 float BossMobGuiInfo::healthProgress = 0.0f;
 int BossMobGuiInfo::displayTicks = 0;
diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp
index 27d962b36..51b721f51 100644
--- a/Minecraft.Client/BreakingItemParticle.cpp
+++ b/Minecraft.Client/BreakingItemParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "BreakingItemParticle.h"
 #include "Tesselator.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
 {	
diff --git a/Minecraft.Client/BubbleParticle.cpp b/Minecraft.Client/BubbleParticle.cpp
index 68f199116..2d1380eb5 100644
--- a/Minecraft.Client/BubbleParticle.cpp
+++ b/Minecraft.Client/BubbleParticle.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "BubbleParticle.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
 
 BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 	{
diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp
index 34f1e981a..37662d8a1 100644
--- a/Minecraft.Client/BufferedImage.cpp
+++ b/Minecraft.Client/BufferedImage.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"	
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "Textures.h"
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "BufferedImage.h"
 
 #ifdef _XBOX
diff --git a/Minecraft.Client/Camera.cpp b/Minecraft.Client/Camera.cpp
index bed88b121..4de963491 100644
--- a/Minecraft.Client/Camera.cpp
+++ b/Minecraft.Client/Camera.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Camera.h"
 #include "MemoryTracker.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/TilePos.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\TilePos.h"
 
 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;
diff --git a/Minecraft.Client/Camera.h b/Minecraft.Client/Camera.h
index 4a40de20d..456c8858d 100644
--- a/Minecraft.Client/Camera.h
+++ b/Minecraft.Client/Camera.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/IntBuffer.h>
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\IntBuffer.h"
 
 
 class TilePos;
diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp
index 34ebfdd4f..b68e6cac0 100644
--- a/Minecraft.Client/ChatScreen.cpp
+++ b/Minecraft.Client/ChatScreen.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "ChatScreen.h"
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
 
diff --git a/Minecraft.Client/ChestRenderer.cpp b/Minecraft.Client/ChestRenderer.cpp
index b99b7de35..97954b55a 100644
--- a/Minecraft.Client/ChestRenderer.cpp
+++ b/Minecraft.Client/ChestRenderer.cpp
@@ -3,9 +3,9 @@
 #include "ChestModel.h"
 #include "LargeChestModel.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/Calendar.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\Calendar.h"
 
 ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
 //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST);
diff --git a/Minecraft.Client/ChickenModel.cpp b/Minecraft.Client/ChickenModel.cpp
index 3ae7e4bf5..98ef93587 100644
--- a/Minecraft.Client/ChickenModel.cpp
+++ b/Minecraft.Client/ChickenModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ChickenModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/ChickenRenderer.cpp b/Minecraft.Client/ChickenRenderer.cpp
index f88483286..4f369df35 100644
--- a/Minecraft.Client/ChickenRenderer.cpp
+++ b/Minecraft.Client/ChickenRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ChickenRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN);
 
diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp
index cd1a5d651..d039227bf 100644
--- a/Minecraft.Client/Chunk.cpp
+++ b/Minecraft.Client/Chunk.cpp
@@ -2,16 +2,16 @@
 #include "Chunk.h"
 #include "TileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "LevelRenderer.h"
 
 #ifdef __PS3__
-#include <PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h>
-#include <PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h>
-#include <PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h>
+#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h"
+#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h"
+#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h"
 
 #include "C4JThread_SPU.h"
 #include "C4JSpursJob.h"
diff --git a/Minecraft.Client/Chunk.h b/Minecraft.Client/Chunk.h
index 064fb6a34..f7947156f 100644
--- a/Minecraft.Client/Chunk.h
+++ b/Minecraft.Client/Chunk.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "AllowAllCuller.h"
 #include "Tesselator.h"
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "LevelRenderer.h"
 
 class Level;
diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp
index a3eabf9a4..f3510d336 100644
--- a/Minecraft.Client/ClientConnection.cpp
+++ b/Minecraft.Client/ClientConnection.cpp
@@ -9,55 +9,55 @@
 #include "TakeAnimationParticle.h"
 #include "CritParticle.h"
 #include "User.h"
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.ai.attributes.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.npc.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/Socket.h>
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\Socket.h"
 #include "Minecraft.h"
 #include "ProgressRenderer.h"
 #include "LevelRenderer.h"
 #include "Options.h"
 #include "MinecraftServer.h"
 #include "ClientConstants.h"
-#include <Minecraft.World/SoundTypes.h>
-#include <Minecraft.World/BasicTypeContainers.h>
+#include "..\Minecraft.World\SoundTypes.h"
+#include "..\Minecraft.World\BasicTypeContainers.h"
 #include "TexturePackRepository.h"
 #ifdef _XBOX
-#include <Common/XUI/XUI_Scene_Trading.h>
+#include "Common\XUI\XUI_Scene_Trading.h"
 #else
-#include <Common/UI/UI.h>
+#include "Common\UI\UI.h"
 #endif
 #ifdef __PS3__
-#include <PS3/Network/SonyVoiceChat.h>
+#include "PS3/Network/SonyVoiceChat.h"
 #endif
 #include "DLCTexturePack.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
-#include <Minecraft.World/GenericStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
+#include "..\Minecraft.World\GenericStats.h"
 #endif
 
 ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)
diff --git a/Minecraft.Client/ClientConnection.h b/Minecraft.Client/ClientConnection.h
index 5c254b404..a80c10f78 100644
--- a/Minecraft.Client/ClientConnection.h
+++ b/Minecraft.Client/ClientConnection.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.network.h>
+#include "..\Minecraft.World\net.minecraft.network.h"
 class Minecraft;
 class MultiPlayerLevel;
 class SavedDataStorage;
diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp
index 947044b1d..837532fb7 100644
--- a/Minecraft.Client/ClockTexture.cpp
+++ b/Minecraft.Client/ClockTexture.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Minecraft.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\JavaMath.h"
 #include "Texture.h"
 #include "ClockTexture.h"
 
diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
index 3c073674f..43d700d6d 100644
--- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include <Minecraft.World/SoundTypes.h>
+#include "..\..\..\Minecraft.World\SoundTypes.h"
 
 #ifdef _XBOX
 
 #elif defined (__PS3__)
 #undef __in
 #undef __out
-#include <PS3/Miles/include/mss.h>
+#include "..\..\PS3\Miles\include\mss.h"
 #elif defined (__PSVITA__)
-#include <PSVITA/Miles/include/mss.h>
+#include "..\..\PSVITA\Miles\include\mss.h"
 #elif defined _DURANGO
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT
-#include <Durango/Miles/include/mss.h>
+#include "..\..\Durango\Miles\include\mss.h"
 #elif defined _WINDOWS64
 #include <windows64/Miles/include/mss.h>
 #elif defined _CROSS64 
@@ -21,7 +21,7 @@
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2
-#include <Orbis/Miles/include/mss.h>
+#include "..\..\Orbis\Miles\include\mss.h"
 #endif
 
 typedef struct
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 9684d0862..486b102ae 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 
 #include "SoundEngine.h"
+<<<<<<< HEAD
 #include <Consoles_App.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.level.h>
@@ -9,14 +10,24 @@
 #include <TexturePackRepository.h>
 #include <DLCTexturePack.h>
 #include <Common/DLC/DLCAudioFile.h>
+=======
+#include "..\Consoles_App.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\Minecraft.World\leveldata.h"
+#include "..\..\Minecraft.World\mth.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\DLCTexturePack.h"
+#include "Common\DLC\DLCAudioFile.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #ifdef __PSVITA__
 #include <audioout.h>
 #endif
 
 #ifdef _WINDOWS64
-#include <Minecraft.Client/Windows64/Windows64_App.h>
-#include <Minecraft.Client/Windows64/Miles/include/imssapi.h>
+#include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
+#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h"
 #endif
 
 #ifdef __ORBIS__
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index 1dd8410a2..92c99d236 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include <Minecraft.World/SoundTypes.h>
+#include "..\..\Minecraft.World\SoundTypes.h"
 
 enum eMUSICFILES
 {
diff --git a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
index 36fe21f28..a46cc76db 100644
--- a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
+++ b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include <Minecraft.Client/Common/C4JMemoryPool.h>
+#include "..\Minecraft.Client\Common\C4JMemoryPool.h"
 
 // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations.
 
diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp
index 041e0c666..5c74d5ece 100644
--- a/Minecraft.Client/Common/Colours/ColourTable.cpp
+++ b/Minecraft.Client/Common/Colours/ColourTable.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ColourTable.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;
 
diff --git a/Minecraft.Client/Common/ConsoleGameMode.cpp b/Minecraft.Client/Common/ConsoleGameMode.cpp
index 1de00ae56..703d3f552 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.cpp
+++ b/Minecraft.Client/Common/ConsoleGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include <./Tutorial/Tutorial.h>
+#include ".\Tutorial\Tutorial.h"
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Common/ConsoleGameMode.h b/Minecraft.Client/Common/ConsoleGameMode.h
index a9f813dd4..983381b59 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.h
+++ b/Minecraft.Client/Common/ConsoleGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <./Tutorial/TutorialMode.h>
+#include ".\Tutorial\TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 8b8efbde1..b476ca909 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -1,64 +1,64 @@
 
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/compression.h>
-#include <Options.h>
-#include <MinecraftServer.h>
-#include <MultiPlayerLevel.h>
-#include <GameRenderer.h>
-#include <ProgressRenderer.h>
-#include <LevelRenderer.h>
-#include <MobSkinMemTextureProcessor.h>
-#include <Minecraft.h>
-#include <ClientConnection.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/Inventory.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/DispenserTileEntity.h>
-#include <Minecraft.World/SignTileEntity.h>
-#include <StatsCounter.h>
-#include <GameMode.h>
-#include <Xbox/Social/SocialManager.h>
-#include <Tutorial/TutorialMode.h>
+#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\Options.h"
+#include "..\MinecraftServer.h"
+#include "..\MultiPlayerLevel.h"
+#include "..\GameRenderer.h"
+#include "..\ProgressRenderer.h"
+#include "..\LevelRenderer.h"
+#include "..\MobSkinMemTextureProcessor.h"
+#include "..\Minecraft.h"
+#include "..\ClientConnection.h"
+#include "..\MultiPlayerLocalPlayer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\Player.h"
+#include "..\..\Minecraft.World\Inventory.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\FurnaceTileEntity.h"
+#include "..\..\Minecraft.World\Container.h"
+#include "..\..\Minecraft.World\DispenserTileEntity.h"
+#include "..\..\Minecraft.World\SignTileEntity.h"
+#include "..\StatsCounter.h"
+#include "..\GameMode.h"
+#include "..\Xbox\Social\SocialManager.h"
+#include "Tutorial\TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include <Xbox/XML/ATGXmlParser.h>
-#include <Xbox/XML/xmlFilesCallback.h>
+#include "..\Xbox\XML\ATGXmlParser.h"
+#include "..\Xbox\XML\xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include <PlayerList.h>
-#include <ServerPlayer.h>
-#include <GameRules/ConsoleGameRules.h>
-#include <GameRules/ConsoleSchematicFile.h>
-#include <User.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <EntityRenderDispatcher.h>
-#include <Minecraft.World/compression.h>
-#include <TexturePackRepository.h>
-#include <DLCTexturePack.h>
-#include <DLC/DLCPack.h>
-#include <StringTable.h>
+#include "..\PlayerList.h"
+#include "..\ServerPlayer.h"
+#include "GameRules\ConsoleGameRules.h"
+#include "GameRules\ConsoleSchematicFile.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\LevelData.h"
+#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\EntityRenderDispatcher.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\TexturePackRepository.h"
+#include "..\DLCTexturePack.h"
+#include "DLC\DLCPack.h"
+#include "..\StringTable.h"
 #ifndef _XBOX
-#include <ArchiveFile.h>
+#include "..\ArchiveFile.h"
 #endif
-#include <Minecraft.h>
+#include "..\Minecraft.h"
 #ifdef _XBOX
-#include <Xbox/GameConfig/Minecraft.spa.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
-#include <XUI/XUI_TextEntry.h>
-#include <XUI/XUI_XZP_Icons.h>
-#include <XUI/XUI_PauseMenu.h>
+#include "..\Xbox\GameConfig\Minecraft.spa.h"
+#include "..\Xbox\Network\NetworkPlayerXbox.h"
+#include "XUI\XUI_TextEntry.h"
+#include "XUI\XUI_XZP_Icons.h"
+#include "XUI\XUI_PauseMenu.h"
 #else
-#include <UI/UI.h>
-#include <UI/UIScene_PauseMenu.h>
+#include "UI\UI.h"
+#include "UI\UIScene_PauseMenu.h"
 #endif
 #ifdef __PS3__
 #include <sys/tty.h>
@@ -67,7 +67,7 @@
 #include <save_data_dialog.h>
 #endif
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "..\Common\Leaderboards\LeaderboardManager.h"
 
 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h
index 288984be8..ec36b7652 100644
--- a/Minecraft.Client/Common/Consoles_App.h
+++ b/Minecraft.Client/Common/Consoles_App.h
@@ -2,26 +2,26 @@
 
 using namespace std;
 
-#include <Audio/Consoles_SoundEngine.h>
+#include "Audio/Consoles_SoundEngine.h"
 
 #include <xuiapp.h>
-#include <./Tutorial/TutorialEnum.h>
+#include ".\Tutorial\TutorialEnum.h"
 
 #ifdef _XBOX
-#include <./XUI/XUI_Helper.h>
-#include <./XUI/XUI_HelpCredits.h>
+#include ".\XUI\XUI_Helper.h"
+#include ".\XUI\XUI_HelpCredits.h"
 #endif
-#include <UI/UIStructs.h>
+#include "UI\UIStructs.h"
 
-#include <Minecraft.World/DisconnectPacket.h>
+#include "..\..\Minecraft.World\DisconnectPacket.h"
 #include <xsocialpost.h>
 
-#include <StringTable.h>
-#include <./DLC/DLCManager.h>
-#include <./GameRules/ConsoleGameRulesConstants.h>
-#include <./GameRules/GameRuleManager.h>
-#include <SkinBox.h>
-#include <ArchiveFile.h>
+#include "..\StringTable.h"
+#include ".\DLC\DLCManager.h"
+#include ".\GameRules\ConsoleGameRulesConstants.h"
+#include ".\GameRules\GameRuleManager.h"
+#include "..\SkinBox.h"
+#include "..\ArchiveFile.h"
 
 typedef struct _JoinFromInviteData
 {
diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
index 5132db8c5..49ba52cda 100644
--- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
@@ -2,8 +2,8 @@
 #include "DLCManager.h"
 #include "DLCAudioFile.h"
 #if defined _XBOX || defined _WINDOWS64
-#include <Xbox/XML/ATGXmlParser.h>
-#include <Xbox/XML/xmlFilesCallback.h>
+#include "..\..\Xbox\XML\ATGXmlParser.h"
+#include "..\..\Xbox\XML\xmlFilesCallback.h"
 #endif
 
 DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)
diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
index 6ffafcc62..ec800dacf 100644
--- a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
 
 DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	
diff --git a/Minecraft.Client/Common/DLC/DLCGameRules.h b/Minecraft.Client/Common/DLC/DLCGameRules.h
index b278cb56c..9d3bbaad4 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRules.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRules.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCFile.h"
-#include <GameRules/LevelGenerationOptions.h>
+#include "..\GameRules\LevelGenerationOptions.h"
 
 class DLCGameRules : public DLCFile
 {
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
index 4fff3417f..39b852190 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/InputOutputStream.h>
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
 
 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
index 1fac203a8..4521ae110 100644
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DLCGameRules.h"
-#include <GameRules/LevelGenerationOptions.h>
+#include "..\GameRules\LevelGenerationOptions.h"
 
 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
 {
diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
index 80b7448e5..358a93e50 100644
--- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include <StringTable.h>
+#include "..\..\StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	
diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp
index 2011e07ae..17c9fc6d1 100644
--- a/Minecraft.Client/Common/DLC/DLCManager.cpp
+++ b/Minecraft.Client/Common/DLC/DLCManager.cpp
@@ -3,9 +3,9 @@
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
 
 WCHAR *DLCManager::wchTypeNamesA[]=
 {
diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp
index 0a97867d7..4a003d05d 100644
--- a/Minecraft.Client/Common/DLC/DLCPack.cpp
+++ b/Minecraft.Client/Common/DLC/DLCPack.cpp
@@ -9,7 +9,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
 {
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
index 9ac8b8706..c845acd9b 100644
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include <ModelPart.h>
-#include <EntityRenderer.h>
-#include <EntityRenderDispatcher.h>
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\ModelPart.h"
+#include "..\..\EntityRenderer.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\..\Minecraft.World\Player.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Common/DLC/DLCSkinFile.h
index 2bcf04439..c8dcf0e9c 100644
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.h
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "DLCFile.h"
-#include <Minecraft.Client/HumanoidModel.h>
+#include "..\..\..\Minecraft.Client\HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile
 {
diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
index 18ba05860..eabc14011 100644
--- a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.enchantment.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
 #include "AddEnchantmentRuleDefinition.h"
 
 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()
diff --git a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
index e906be713..0d14884a7 100644
--- a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 
diff --git a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
index 9bfa78947..aa4a8fb25 100644
--- a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
diff --git a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
index 9d26d17ad..22cc0c7ab 100644
--- a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
+++ b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "BiomeOverride.h"
 
 BiomeOverride::BiomeOverride()
diff --git a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
index f159011d4..66abefbbe 100644
--- a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <WstringLookup.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\WstringLookup.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/Connection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\Connection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 CollectItemRuleDefinition::CollectItemRuleDefinition()
 {
diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
index 3d50c4885..adaf70c81 100644
--- a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "CompleteAllRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Connection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Connection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
 {
diff --git a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
index 6995fcc3e..0481a54b2 100644
--- a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "CompoundGameRuleDefinition.h"
 #include "ConsoleGameRules.h"
 
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h b/Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h
index 5b45ff0b5..a7111f042 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h
@@ -1,6 +1,6 @@
 #pragma once
 
-//#include <
+//#include "
 
 class ConsoleGameRules
 {
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
index e296f3eda..0476b0e36 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "ConsoleGenerateStructure.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.h"
 
 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
 {
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
index d4bdc9060..91c4ef357 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructurePiece.h>
+#include "..\..\..\Minecraft.World\StructurePiece.h"
 
 class Level;
 class Random;
diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
index 4a575e606..3b995000f 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include <vector>
-#include <Minecraft.World/com.mojang.nbt.h>
-#include <Minecraft.World/System.h>
+#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
+#include "..\..\..\Minecraft.World\System.h"
 #include "ConsoleSchematicFile.h"
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/compression.h>
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\compression.h"
 
 ConsoleSchematicFile::ConsoleSchematicFile()
 {
diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
index 354c03dfb..f37a60585 100644
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
@@ -4,7 +4,7 @@ using namespace std;
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2
 
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
 
 class Level;
 class DataOutputStream;
diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
index 486d28c05..b63687c22 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <WstringLookup.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\WstringLookup.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "ConsoleGameRules.h"
 
 GameRuleDefinition::GameRuleDefinition()
diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
index 69f15f92b..afec8fbcc 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
@@ -3,7 +3,7 @@ using namespace std;
 #include <unordered_map>
 #include <string>
 
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #include "ConsoleGameRulesConstants.h"
 
 #include "GameRulesInstance.h"
diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
index 51f880c07..6e5688cc7 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/compression.h>
-#include <DLC/DLCPack.h>
-#include <DLC/DLCLocalisationFile.h>
-#include <DLC/DLCGameRulesFile.h>
-#include <DLC/DLCGameRules.h>
-#include <DLC/DLCGameRulesHeader.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\DLC\DLCPack.h"
+#include "..\DLC\DLCLocalisationFile.h"
+#include "..\DLC\DLCGameRulesFile.h"
+#include "..\DLC\DLCGameRules.h"
+#include "..\DLC\DLCGameRulesHeader.h"
+#include "..\..\StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 
diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
index d29c949aa..9ebd34289 100644
--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
@@ -2,13 +2,13 @@
 
 #include <unordered_set>
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Common/DLC/DLCGameRulesHeader.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Pos.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "Common\DLC\DLCGameRulesHeader.h"
+#include "..\..\StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"
 
diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
index 962a54515..aa128ff84 100644
--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
@@ -4,7 +4,7 @@ using namespace std;
 #pragma message("LevelGenerationOptions.h ")
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructureFeature.h>
+#include "..\..\..\Minecraft.World\StructureFeature.h"
 
 class ApplySchematicRuleDefinition;
 class LevelChunk;
diff --git a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
index 8b603347e..1c7ecd475 100644
--- a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <StringTable.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\StringTable.h"
 #include "ConsoleGameRules.h"
 #include "LevelRuleset.h"
 
diff --git a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
index ffd10cf9c..41ff15e86 100644
--- a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NamedAreaRuleDefinition.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
 
 NamedAreaRuleDefinition::NamedAreaRuleDefinition()
 {
diff --git a/Minecraft.Client/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Common/GameRules/StartFeature.cpp
index 946f7e0d2..7f0c8b5c9 100644
--- a/Minecraft.Client/Common/GameRules/StartFeature.cpp
+++ b/Minecraft.Client/Common/GameRules/StartFeature.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "StartFeature.h"
 
 StartFeature::StartFeature()
diff --git a/Minecraft.Client/Common/GameRules/StartFeature.h b/Minecraft.Client/Common/GameRules/StartFeature.h
index 35ef24032..b198a2fa2 100644
--- a/Minecraft.Client/Common/GameRules/StartFeature.h
+++ b/Minecraft.Client/Common/GameRules/StartFeature.h
@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/StructureFeature.h>
+#include "..\..\..\Minecraft.World\StructureFeature.h"
 
 class StartFeature : public GameRuleDefinition
 {
diff --git a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
index e48ab73f6..6e55cd459 100644
--- a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UpdatePlayerRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\Pos.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
 {
diff --git a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
index a5fcdf266..965405ae6 100644
--- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 
 UseTileRuleDefinition::UseTileRuleDefinition()
diff --git a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
index 0758142e0..ad64bfe47 100644
--- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "GameRuleDefinition.h"
-#include <Minecraft.World/Pos.h>
+#include "..\..\..\Minecraft.World\Pos.h"
 
 class UseTileRuleDefinition : public GameRuleDefinition
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
index f59bfdbd9..6d687b360 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionGenerateBox.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
index 8481c010e..b816d5b67 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionPlaceBlock.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
 
 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
index 8e6034350..d81a2b033 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
 #include "AddItemRuleDefinition.h"
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
index 204da19f2..3f6204af7 100644
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XboxStructureActionPlaceSpawner.h"
-#include <Minecraft.World/net.minecraft.world.level.levelgen.structure.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 
 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner()
 {
diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
index 356489e4f..33707b14c 100644
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include "LeaderboardManager.h"
 
diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
index bf4170706..78d62568c 100644
--- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
@@ -8,21 +8,21 @@
 
 #include "base64.h"
 
-#include <Common/Consoles_App.h>
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "Common\Consoles_App.h"
+#include "Common\Network\Sony\SQRNetworkManager.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 
 #ifdef __ORBIS__
-#include <Orbis/OrbisExtras/ShutdownManager.h>
-#include <Orbis/Orbis_App.h>
+#include "Orbis\OrbisExtras\ShutdownManager.h"
+#include "Orbis\Orbis_App.h"
 #elif defined __PSVITA__
-#include <PSVita/PSVitaExtras/ShutdownManager.h>
-#include <PSVita/PSVita_App.h>
+#include "PSVita\PSVitaExtras\ShutdownManager.h"
+#include "PSVita\PSVita_App.h"
 #elif defined __PS3__
-#include <PS3/PS3Extras/ShutdownManager.h>
-#include <PS3/PS3_App.h>
+#include "PS3\PS3Extras\ShutdownManager.h"
+#include "PS3\PS3_App.h"
 #else
 #error "SonyLeaderboardManager is included for a non-sony platform."
 #endif
diff --git a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h
index 3d8ba119f..3b2c26c5f 100644
--- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h
+++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 #ifdef __PS3__
 typedef CellRtcTick SonyRtcTick;
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
index 53de3cac2..b3fb5cd70 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
@@ -1,44 +1,44 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/FireworksRecipe.h>
-#include <ClientConnection.h>
-#include <Minecraft.h>
-#include <User.h>
-#include <MinecraftServer.h>
-#include <PlayerList.h>
-#include <ServerPlayer.h>
-#include <PlayerConnection.h>
-#include <MultiPlayerLevel.h>
-#include <ProgressRenderer.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.World/DisconnectPacket.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\ThreadName.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\FireworksRecipe.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\Minecraft.h"
+#include "..\..\User.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\PlayerList.h"
+#include "..\..\ServerPlayer.h"
+#include "..\..\PlayerConnection.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\..\..\Minecraft.World\OldChunkStorage.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
 
-#include <Gui.h>
-#include <LevelRenderer.h>
-#include <Minecraft.World/IntCache.h>
-#include <GameRules/ConsoleGameRules.h>
+#include "..\..\Gui.h"
+#include "..\..\LevelRenderer.h"
+#include "..\..\..\Minecraft.World\IntCache.h"
+#include "..\GameRules\ConsoleGameRules.h"
 #include "GameNetworkManager.h"
 
 #ifdef _XBOX
-#include <Common/XUI/XUI_PauseMenu.h>
+#include "Common\XUI\XUI_PauseMenu.h"
 #else
-#include <Common/UI/UI.h>
-#include <Common/UI/UIScene_PauseMenu.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "Common\UI\UI.h"
+#include "Common\UI\UIScene_PauseMenu.h"
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #endif
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 // Global instance
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h
index 2a4defd43..01db27240 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.h
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.h
@@ -2,21 +2,21 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #ifdef _XBOX
-#include <Xbox/Network/PlatformNetworkManagerXbox.h>
+#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
 #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-#include <Common/Network/Sony/PlatformNetworkManagerSony.h>
+#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
 #elif defined _DURANGO
-#include <Durango/Network/PlatformNetworkManagerDurango.h>
+#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
 #else
 #include "PlatformNetworkManagerStub.h"
 #endif
 #include "SessionInfo.h"
 
 #ifdef __ORBIS__
-#include <Orbis/Network/PsPlusUpsellWrapper_Orbis.h>
+#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
 #endif
 
 class ClientConnection;
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
index 5bec29199..31c415a75 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
@@ -2,7 +2,7 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
index 9f8603f07..10d1a6a53 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"	
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerStub.h"
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #ifdef _WINDOWS64
-#include <Windows64/Network/WinsockNetLayer.h>
-#include <Minecraft.h>
-#include <User.h>
+#include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\User.h"
 #endif
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
index 367b2401b..28953cecb 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Minecraft.World/C4JThread.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h
index 37189d444..ce6365bc4 100644
--- a/Minecraft.Client/Common/Network/SessionInfo.h
+++ b/Minecraft.Client/Common/Network/SessionInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #if defined(__PS3__) || defined(__ORBIS__)
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 #endif
 
 
diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
index ceb0eeb99..f3415a41a 100644
--- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/NetworkPlayerInterface.h>
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
 #include "SQRNetworkPlayer.h"
 
 // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way.
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
index dd24aa7d6..67fd058c0 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerSony.h"
 #include "NetworkPlayerSony.h"
-#include <Common/Network/GameNetworkManager.h>
+#include "..\..\Common\Network\GameNetworkManager.h"
 
 CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
 
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
index d7baba365..258acd833 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Minecraft.World/C4JThread.h>
-#include <Common/Network/NetworkPlayerInterface.h>
-#include <Common/Network/PlatformNetworkManagerInterface.h>
-#include <Common/Network/SessionInfo.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
+#include "..\..\Common\Network\SessionInfo.h"
 #include "SQRNetworkPlayer.h"
 
 // This is how often we allow a search for new games
diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
index af5de6086..e3f15aca1 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <np.h>
 #ifdef __PS3__
-#include <netex/libnetctl.h>
-#include <netex/net.h>
+#include <netex\libnetctl.h>
+#include <netex\net.h>
 #else
 #include <libnetctl.h>
 #include <net.h>
@@ -12,7 +12,7 @@
 
 #include <unordered_map>
 #if defined __PSVITA__
-#include <Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h>
+#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
 #endif
 
 class SQRNetworkPlayer;
diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
index 9dcbfef67..a040b28bd 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkPlayer.cpp
@@ -3,16 +3,16 @@
 
 #ifdef __PS3__
 #include <cell/rudp.h>
-#include <PS3/Network/SonyVoiceChat.h>
+#include "PS3/Network/SonyVoiceChat.h"
 
 #elif defined __ORBIS__
 #include <rudp.h>
-#include <Orbis/Network/SonyVoiceChat_Orbis.h>
+#include "Orbis/Network/SonyVoiceChat_Orbis.h"
 
 #else // __PSVITA__
 #include <rudp.h>
 #include <adhoc_matching.h>
-#include <PSVita/Network/SonyVoiceChat_Vita.h>
+#include "PSVita/Network/SonyVoiceChat_Vita.h"
 
 #endif
 
diff --git a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
index 5fbc6ad38..8435cd562 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce.h"
-#include <PS3Extras/ShutdownManager.h>
+#include "..\PS3Extras\ShutdownManager.h"
 #include <sys/event.h>
 
 
diff --git a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
index 7080ccce1..f0095885c 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
@@ -3,15 +3,15 @@
 
 
 #ifdef __PS3__
-#include <PS3/Network/SonyHttp_PS3.h>
+#include "PS3\Network\SonyHttp_PS3.h"
 SonyHttp_PS3 g_SonyHttp;
 
 #elif defined __ORBIS__
-#include <Orbis/Network/SonyHttp_Orbis.h>
+#include "Orbis\Network\SonyHttp_Orbis.h"
 SonyHttp_Orbis g_SonyHttp;
 
 #elif defined __PSVITA__
-#include <PSVita/Network/SonyHttp_Vita.h>
+#include "PSVita\Network\SonyHttp_Vita.h"
 SonyHttp_Vita g_SonyHttp;
 
 #endif
diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
index c5ba48b90..d38a06e2c 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
+++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include <Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h>
+#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
 
 class SonyRemoteStorage
 {
diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
index 7b85e054a..4b04b19c1 100644
--- a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
+++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
@@ -2,9 +2,9 @@
 
 #include "MultiPlayerLocalPlayer.h"
 
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/Level.h>
+#include "..\Minecraft.World\LevelSettings.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\Level.h"
 
 #include "TelemetryManager.h"
 
diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Common/Telemetry/TelemetryManager.h
index 025cfff19..40b6c04c6 100644
--- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h
+++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIEnums.h>
+#include "..\..\Common\UI\UIEnums.h"
 
 class CTelemetryManager
 {
diff --git a/Minecraft.Client/Common/Trial/TrialMode.cpp b/Minecraft.Client/Common/Trial/TrialMode.cpp
index 2c76f3ed8..e81491389 100644
--- a/Minecraft.Client/Common/Trial/TrialMode.cpp
+++ b/Minecraft.Client/Common/Trial/TrialMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TrialMode.h"
-#include <Tutorial/FullTutorial.h>
+#include "..\Tutorial\FullTutorial.h"
 
 TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: FullTutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Common/Trial/TrialMode.h b/Minecraft.Client/Common/Trial/TrialMode.h
index 9832e846a..a1034acf5 100644
--- a/Minecraft.Client/Common/Trial/TrialMode.h
+++ b/Minecraft.Client/Common/Trial/TrialMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Tutorial/FullTutorialMode.h>
+#include "..\Tutorial\FullTutorialMode.h"
 
 class TrialMode : public FullTutorialMode
 {
diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
index f328b2063..406ea7d91 100644
--- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
@@ -1,9 +1,14 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "AreaConstraint.h"
-#include <Minecraft.World/AABB.h>
+#include "..\..\..\Minecraft.World\AABB.h"
 
 AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
 	: TutorialConstraint( descriptionId )
diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
index 20bab19df..0a369b0da 100644
--- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
@@ -1,9 +1,14 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "AreaHint.h"
-#include <Minecraft.World/AABB.h>
+#include "..\..\..\Minecraft.World\AABB.h"
 #include "Tutorial.h"
 
 AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,
diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
index 5dff1aed7..d411ae067 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@@ -1,13 +1,19 @@
 #include "stdafx.h"
 
 #include "Tutorial.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.level.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "ChangeStateConstraint.h"
-#include <Minecraft.World/AABB.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount,
 	double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )
diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
index 7e667b9ba..b359bb808 100644
--- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
@@ -1,13 +1,18 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
-#include <Minecraft.World/Material.h>
-#include <Windows64/KeyboardMouseInput.h>
+#include "..\..\..\Minecraft.World\Material.h"
+#include "..\..\Windows64\KeyboardMouseInput.h"
 
 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
diff --git a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
index b2d865def..43b2f7f31 100644
--- a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #include "CompleteUsingItemTask.h"
 
 CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)
diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
index 71fbe5532..d1bfa9812 100644
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
@@ -1,8 +1,13 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ControllerTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
index 7f7399333..6749d0302 100644
--- a/Minecraft.Client/Common/Tutorial/CraftTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CraftTask.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
 	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
diff --git a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
index 46a80cdc7..86dbe5005 100644
--- a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
 #include "Tutorial.h"
 #include "DiggerItemHint.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
index fb748b564..5f1b5b20b 100644
--- a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.effect.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
 #include "EffectChangedTask.h"
 
 EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
index 3b5c6560b..d0fda62e1 100644
--- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <GameRules/ConsoleGameRules.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\GameRules\ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
 #include "AreaHint.h"
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
index c7e973e57..a5ee85b86 100644
--- a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp
index 235c12025..e1d50fbfb 100644
--- a/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/HorseChoiceTask.cpp
@@ -5,7 +5,7 @@
 #include "Minecraft.h"
 #include "Tutorial.h"
 
-#include <Minecraft.World/EntityHorse.h>
+#include "..\Minecraft.World\EntityHorse.h"
 
 #include "HorseChoiceTask.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
index 8561cd56d..a51269064 100644
--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@@ -1,13 +1,18 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
-#include <Minecraft.World/Material.h>
-#include <KeyboardMouseInput.h>
+#include "..\..\..\Minecraft.World\Material.h"
+#include "..\..\KeyboardMouseInput.h"
 
 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
diff --git a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
index 55f79dbc2..991366919 100644
--- a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
+++ b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/Class.h>
+#include "..\..\..\Minecraft.World\Class.h"
 #include "TutorialHint.h"
 
 class ItemInstance;
diff --git a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
index 5efea47f4..c8723a84b 100644
--- a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "LookAtTileHint.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
index 04b9ea24c..29fe592d5 100644
--- a/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/RideEntityTask.cpp
@@ -5,7 +5,7 @@
 #include "Minecraft.h"
 #include "Tutorial.h"
 
-#include <Minecraft.World/EntityHorse.h>
+#include "..\Minecraft.World\EntityHorse.h"
 
 #include "RideEntityTask.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Common/Tutorial/StatTask.cpp
index 6c7172b1d..5f8b215e3 100644
--- a/Minecraft.Client/Common/Tutorial/StatTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/StatTask.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <LocalPlayer.h>
-#include <StatsCounter.h>
-#include <Minecraft.World/net.minecraft.stats.h>
+#include "..\..\Minecraft.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\StatsCounter.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
 #include "StatTask.h"
 
 StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
diff --git a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
index 33c084d7a..a1a5c37a9 100644
--- a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "TakeItemHint.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
index c58a4373d..057e21713 100644
--- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <MinecraftServer.h>
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <MultiPlayerLevel.h>
-#include <SurvivalMode.h>
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\SurvivalMode.h"
 #include "Tutorial.h"
 #include "TutorialMessage.h"
 #include "TutorialTasks.h"
diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
index e3bd2f725..7c77e1bee 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
@@ -1,11 +1,16 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "Tutorial.h"
 #include "TutorialHint.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) 
 	: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
index 42b3a609f..031831743 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include <memory>
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <MultiPlayerLevel.h>
@@ -7,6 +8,15 @@
 #include <Minecraft.World/net.minecraft.world.item.h>
 #include <Minecraft.World/net.minecraft.world.level.h>
 #include <Minecraft.World/net.minecraft.world.level.tile.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\..\Minecraft.World\Inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "TutorialMode.h"
 
 TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad )
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h
index 3e5aa4f02..75e24edf0 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.h
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <MultiPlayerGameMode.h>
+#include "..\..\MultiPlayerGameMode.h"
 #include "Tutorial.h"
 
 class TutorialMode : public MultiPlayerGameMode
diff --git a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
index fd4188099..09bac4d17 100644
--- a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #include "UseItemTask.h"
 
 UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
diff --git a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
index 9ce5784e4..1f4ed4cb3 100644
--- a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #include "UseTileTask.h"
 
 UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
index fe2a97a77..71b884790 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 #if !(defined _XBOX) && !(defined __PSVITA__)
-#include <UI/UI.h>
+#include "..\UI\UI.h"
 #endif
 #include "Tutorial.h"
 #include "XuiCraftingTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
index 756aa67d4..2dc48709d 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "TutorialTask.h"
-#include <Minecraft.World/Recipy.h>
+#include "..\..\..\Minecraft.World\Recipy.h"
 
 class XuiCraftingTask : public TutorialTask
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
index fade63080..348eaffba 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -2,12 +2,21 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.World/net.minecraft.world.item.h>
 #include <Minecraft.World/net.minecraft.world.item.crafting.h>
 #include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #ifdef __ORBIS__
 #include <pad.h>
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
index e4a6aaedd..10d1bcc41 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "IUIScene_AnvilMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
 
 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
index 342faac2c..4e9e3aa79 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.ContainerListener.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h"
 
 // The 0-indexed slot in the inventory list that lines up with the result slot
 #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5
diff --git a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
index 213949fec..76d21406c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/CustomPayloadPacket.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/HtmlString.h>
+#include "..\Minecraft.World\CustomPayloadPacket.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\HtmlString.h"
 #include "IUIScene_BeaconMenu.h"
 #include "Minecraft.h"
 #include "MultiPlayerLocalPlayer.h"
diff --git a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h
index 4968022d7..1f5f73401 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Common/UI/IUIScene_AbstractContainerMenu.h>
+#include "Common\UI\IUIScene_AbstractContainerMenu.h"
 
 class BeaconTileEntity;
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
index 43684c815..44bbdc44b 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_BrewingMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
index c3097f0bf..4371b4e58 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/CustomPayloadPacket.h>
+#include "../../../Minecraft.World/CustomPayloadPacket.h"
 #include "MultiPlayerLocalPlayer.h"
 #include "ClientConnection.h"
 #include "IUIScene_CommandBlockMenu.h"
diff --git a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.h b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.h
index 04efc714e..db0aff821 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 
 class IUIScene_CommandBlockMenu
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
index b02bb57b3..c6a4df002 100644
--- a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_ContainerMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
index d3dd79b0a..05a44202d 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.item.crafting.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <LocalPlayer.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]=
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
index 4b6e9058a..03a58378c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Item.h>
+#include "..\..\..\Minecraft.World\Recipy.h"
+#include "..\..\..\Minecraft.World\Item.h"
 
 class LocalPlayer;
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index 5953d76c8..a9416667c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "IUIScene_CreativeMenu.h"
 
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.inventory.h>
@@ -11,6 +12,18 @@
 #include <Minecraft.World/net.minecraft.world.entity.h>
 #include <Minecraft.World/net.minecraft.world.entity.animal.h>
 #include <Minecraft.World/JavaMath.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\..\..\Minecraft.World\JavaMath.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 // 4J JEV - Images for each tab.
 IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL;
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
index 1cd89381e..64b78029b 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include <Minecraft.World/AbstractContainerMenu.h>
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
 // 4J Stu - This class is for code that is common between XUI and Iggy
 
 class SimpleContainer;
diff --git a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
index f37f317f8..ec8a73c35 100644
--- a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_DispenserMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
index 7b434a323..346bf53f9 100644
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -1,7 +1,13 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "IUIScene_EnchantingMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
diff --git a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp
index a77c7afc9..7f90fe8f4 100644
--- a/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_FireworksMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_FireworksMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FireworksMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
index 496148741..4a6c6762a 100644
--- a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_FurnaceMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
index cdc101acc..03adbd2c2 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.ai.attributes.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "IUIScene_HUD.h"
 
 IUIScene_HUD::IUIScene_HUD()
diff --git a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp
index a5e4c9177..392c12d41 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_HopperMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HopperMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h
index 4418817e5..ef6d8d25d 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_HopperMenu.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "IUIScene_AbstractContainerMenu.h"
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/Inventory.h>
+#include "../../../Minecraft.World/Container.h"
+#include "../../../Minecraft.World/Inventory.h"
 
 class IUIScene_HopperMenu : public virtual IUIScene_AbstractContainerMenu
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp
index 6f2fb60f2..8f1caab8c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_HorseInventoryMenu.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_HorseInventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h
index fc408cf7b..6df2001e7 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_HorseInventoryMenu.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "IUIScene_AbstractContainerMenu.h"
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/Inventory.h>
-#include <Minecraft.World/EntityHorse.h>
+#include "../../../Minecraft.World/Container.h"
+#include "../../../Minecraft.World/Inventory.h"
+#include "../../../Minecraft.World/EntityHorse.h"
 
 class IUIScene_HorseInventoryMenu : public virtual IUIScene_AbstractContainerMenu
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
index b4deb8314..7bed406ac 100644
--- a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_InventoryMenu.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
index 790e657c3..ab1767d4f 100644
--- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "IUIScene_PauseMenu.h"
-#include <Minecraft.h>
-#include <MinecraftServer.h>
-#include <MultiPlayerLevel.h>
-#include <ProgressRenderer.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <DLCTexturePack.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\DLCTexturePack.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #ifndef _XBOX
 #include "UI.h"
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
index 87354f82f..8cc04940b 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
 IUIScene_TradingMenu::IUIScene_TradingMenu()
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
index 4fa1c27dc..726f13c7a 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/MerchantMenu.h>
+#include "..\Minecraft.World\MerchantMenu.h"
 
 class MerchantRecipe;
 
diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
index bc3919768..98b4f1654 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Chat.h"
-#include <Minecraft.h>
-#include <Gui.h>
+#include "..\..\Minecraft.h"
+#include "..\..\Gui.h"
 
 UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
index 26bf65726..cb6443a17 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -3,8 +3,8 @@
 #include "UIComponent_Panorama.h"
 #include "Minecraft.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
 
 UIComponent_Panorama::UIComponent_Panorama(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
index 9797d85ad..9af43df49 100644
--- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
index 693bcba40..3036d8baf 100644
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -1,11 +1,19 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
+<<<<<<< HEAD
 #include <Common/Tutorial/Tutorial.h>
 #include <Minecraft.World/StringHelpers.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.h>
 #include <Minecraft.World/net.minecraft.world.level.tile.h>
+=======
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp
index c4a93c25c..ec2e13d8e 100644
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\JavaMath.h"
 
 UIControl::UIControl()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Common/UI/UIControl_Base.cpp
index 3eb04f2c1..7a4a24e5e 100644
--- a/Minecraft.Client/Common/UI/UIControl_Base.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\JavaMath.h"
 
 UIControl_Base::UIControl_Base()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
index cc95fb199..9664dbf4f 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentBook.h"
-#include <Minecraft.h>
-#include <TileEntityRenderDispatcher.h>
-#include <EnchantTableRenderer.h>
-#include <Lighting.h>
-#include <BookModel.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TileEntityRenderDispatcher.h"
+#include "..\..\EnchantTableRenderer.h"
+#include "..\..\Lighting.h"
+#include "..\..\BookModel.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
index 11aaf1b14..b2d997fac 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -1,10 +1,17 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentButton.h"
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/StringHelpers.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIControl_EnchantmentButton::UIControl_EnchantmentButton()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp
index 6dcf2fc12..47374d214 100644
--- a/Minecraft.Client/Common/UI/UIControl_Label.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Label.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_Label.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 UIControl_Label::UIControl_Label()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
index b81fe4bcf..c7dbf1113 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
@@ -1,22 +1,26 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <ScreenSizeCalculator.h>
-#include <EntityRenderDispatcher.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\EntityRenderDispatcher.h"
 
-#include <PlayerRenderer.h>
-#include <HorseRenderer.h>
+#include "..\..\PlayerRenderer.h"
+#include "..\..\HorseRenderer.h"
 
-#include <HumanoidModel.h>
-#include <ModelHorse.h>
+#include "..\..\HumanoidModel.h"
+#include "..\..\ModelHorse.h"
 
-#include <Lighting.h>
-#include <ModelPart.h>
-#include <Options.h>
+#include "..\..\Lighting.h"
+#include "..\..\ModelPart.h"
+#include "..\..\Options.h"
 
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-//#include <Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+//#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.EntityHorse.h"
 
+<<<<<<< HEAD
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "UI.h"
 #include "UIControl_MinecraftHorse.h"
 
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
index 7659546dd..6234d68e6 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <ScreenSizeCalculator.h>
 #include <EntityRenderDispatcher.h>
@@ -9,6 +10,18 @@
 #include <Options.h>
 #include <Minecraft.World/net.minecraft.world.entity.player.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\PlayerRenderer.h"
+#include "..\..\HumanoidModel.h"
+#include "..\..\Lighting.h"
+#include "..\..\ModelPart.h"
+#include "..\..\Options.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "UI.h"
 #include "UIControl_MinecraftPlayer.h"
 
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
index 5a4ccdb4a..2d7c0224e 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <ScreenSizeCalculator.h>
-#include <EntityRenderDispatcher.h>
-#include <PlayerRenderer.h>
-#include <HumanoidModel.h>
-#include <Lighting.h>
-#include <ModelPart.h>
-#include <Options.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\PlayerRenderer.h"
+#include "..\..\HumanoidModel.h"
+#include "..\..\Lighting.h"
+#include "..\..\ModelPart.h"
+#include "..\..\Options.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "UIControl_PlayerSkinPreview.h"
 
 //#define SKIN_PREVIEW_BOB_ANIM
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
index c1fae94a7..a7c3126e1 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "UIControl.h"
-#include <Textures.h>
+#include "..\..\Textures.h"
 
 class ModelPart;
 class EntityRenderer;
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 167037727..8b38bbb3b 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -2,14 +2,14 @@
 #include "UIController.h"
 #include "UI.h"
 #include "UIScene.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <LocalPlayer.h>
-#include <DLCTexturePack.h>
-#include <TexturePackRepository.h>
-#include <Minecraft.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <EnderDragonRenderer.h>
-#include <MultiPlayerLocalPlayer.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\DLCTexturePack.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\Minecraft.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\..\EnderDragonRenderer.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
 #ifdef __PSVITA__
 #include <message_dialog.h>
@@ -21,7 +21,7 @@
 
 //#define ENABLE_IGGY_EXPLORER
 #ifdef ENABLE_IGGY_EXPLORER
-#include <Windows64/Iggy/include/iggyexpruntime.h>
+#include "Windows64\Iggy\include\iggyexpruntime.h"
 #endif
 
 //#define ENABLE_IGGY_PERFMON
@@ -31,18 +31,18 @@
 #define PM_ORIGIN_Y 34
 
 #ifdef __ORBIS__
-#include <Orbis/Iggy/include/iggyperfmon.h>
-#include <Orbis/Iggy/include/iggyperfmon_orbis.h>
+#include "Orbis\Iggy\include\iggyperfmon.h"
+#include "Orbis\Iggy\include\iggyperfmon_orbis.h"
 #elif defined _DURANGO
-#include <Durango/Iggy/include/iggyperfmon.h>
+#include "Durango\Iggy\include\iggyperfmon.h"
 #elif defined __PS3__
-#include <PS3/Iggy/include/iggyperfmon.h>
-#include <PS3/Iggy/include/iggyperfmon_ps3.h>
+#include "PS3\Iggy\include\iggyperfmon.h"
+#include "PS3\Iggy\include\iggyperfmon_ps3.h"
 #elif defined __PSVITA__
-#include <PSVita/Iggy/include/iggyperfmon.h>
-#include <PSVita/Iggy/include/iggyperfmon_psp2.h>
+#include "PSVita\Iggy\include\iggyperfmon.h"
+#include "PSVita\Iggy\include\iggyperfmon_psp2.h"
 #elif defined __WINDOWS64
-#include <Windows64/Iggy/include/iggyperfmon.h>
+#include "Windows64\Iggy\include\iggyperfmon.h"
 #endif
 
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index 3dd88b352..ba2536434 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -2,10 +2,10 @@
 #include "UI.h"
 #include "UIScene.h"
 
-#include <Lighting.h>
-#include <LocalPlayer.h>
-#include <ItemRenderer.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\Lighting.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\ItemRenderer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 UIScene::UIScene(int iPad, UILayer *parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
index b22583087..9a1803209 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -2,11 +2,17 @@
 #include "UI.h"
 #include "UIScene_AbstractContainerMenu.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.World/net.minecraft.world.item.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #ifdef _WINDOWS64
-#include <Windows64/KeyboardMouseInput.h>
+#include "..\..\Windows64\KeyboardMouseInput.h"
 #endif
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
index 505d3c11a..c810ad455 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 #include "UIScene_AnvilMenu.h"
 
 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
index 7240d64eb..3afc63338 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
@@ -2,7 +2,7 @@
 
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_AnvilMenu.h"
-#include <Minecraft.World/MerchantMenu.h>
+#include "..\Minecraft.World\MerchantMenu.h"
 
 class InventoryMenu;
 
diff --git a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
index c74edc86a..e70397d68 100644
--- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_BeaconMenu.h"
 
 UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
index 94a78ed82..8563054c6 100644
--- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_BrewingStandMenu.h"
 
 UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
index 5cf7bd6da..968072a8e 100644
--- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 
 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
index 3281ad29f..9e48a57b2 100644
--- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
@@ -2,14 +2,14 @@
 #include "UI.h"
 #include "UIScene_ContainerMenu.h"
 
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <LocalPlayer.h>
-#include <Minecraft.h>
-#include <Tutorial/Tutorial.h>
-#include <Tutorial/TutorialMode.h>
-#include <Tutorial/TutorialEnum.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\Minecraft.h"
+#include "..\Tutorial\Tutorial.h"
+#include "..\Tutorial\TutorialMode.h"
+#include "..\Tutorial\TutorialEnum.h"
 
 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
index 999f574aa..923822bf6 100644
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -1,8 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ControlsMenu.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
index 9396f0e12..5c8f2ed94 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -1,8 +1,14 @@
 #include "stdafx.h"
 #include "UI.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.inventory.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "UIScene_CraftingMenu.h"
 
 #ifdef __PSVITA__
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
index 56b6163cf..f7cca84bf 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -1,26 +1,26 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include <MinecraftServer.h>
-#include <Minecraft.h>
-#include <Options.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/LevelType.h>
-#include <DLCTexturePack.h>
+#include "..\..\MinecraftServer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\..\Minecraft.World\IntCache.h"
+#include "..\..\..\Minecraft.World\LevelType.h"
+#include "..\..\DLCTexturePack.h"
 
 #ifdef __PSVITA__
-#include <PSVita/Network/SQRNetworkManager_AdHoc_Vita.h>
+#include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h"
 #endif
 
 #ifdef  _WINDOWS64
 
 #include <windows.h>
-#include <Xbox/Resource.h>
+#include "Xbox\Resource.h"
 #endif
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
index cd8084d73..0895cdffe 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
@@ -2,12 +2,12 @@
 #include "UI.h"
 #include "UIScene_CreativeMenu.h"
 
-#include <Minecraft.World/JavaMath.h>
-#include <LocalPlayer.h>
-#include <Tutorial/Tutorial.h>
-#include <Tutorial/TutorialMode.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\..\LocalPlayer.h"
+#include "..\Tutorial\Tutorial.h"
+#include "..\Tutorial\TutorialMode.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 #ifdef __PSVITA__
 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
index 8861eb65f..75ddf92ff 100644
--- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "UIScene_Credits.h"
 
 #define CREDIT_ICON -2
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
index 48c531b82..77ffdffd9 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #if defined(__PS3__) || defined(__ORBIS__)
-#include <Common/Network/Sony/SonyCommerce.h>
+#include "Common\Network\Sony\SonyCommerce.h"
 #endif
 #include "UIScene_DLCMainMenu.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index dd9424821..65c1b6fc0 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-#include <Common/Network/Sony/SonyHttp.h>
+#include "Common\Network\Sony\SonyHttp.h"
 #endif
 
 #ifdef __PSVITA__
-#include <PSVita/Network/SonyCommerce_Vita.h>
+#include "PSVita\Network\SonyCommerce_Vita.h"
 #endif
 
 #define PLAYER_ONLINE_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index 46b0982fe..61e76babf 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -2,8 +2,13 @@
 #include "UI.h"
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
index cd3d6cd6a..2a8ac9f8e 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -4,8 +4,8 @@
 #include "UI.h"
 #include "UIScene_DebugCreateSchematic.h"
 #include "Minecraft.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
 
 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
index 704add651..cbfe785d0 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene.h"
-#include <Common/GameRules/ConsoleSchematicFile.h>
+#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
 
 class UIScene_DebugCreateSchematic : public UIScene
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
index caad1c96d..8e45c3246 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
@@ -3,18 +3,18 @@
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugOverlay.h"
-#include <Minecraft.h>
-#include <MinecraftServer.h>
-#include <GameRenderer.h>
-#include <MultiPlayerLevel.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\GameRenderer.h"
+#include "..\..\MultiPlayerLevel.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.commands.common.h>
-#include <Minecraft.World/net.minecraft.world.item.enchantment.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
 
 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
index 0fd054df7..dd5a429f0 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
@@ -5,7 +5,7 @@
 #include "UIScene_DebugSetCamera.h"
 #include "Minecraft.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
index b1d50ef73..97cf842a9 100644
--- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_DispenserMenu.h"
 
 UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
index 18070a762..3177344df 100644
--- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_EULA.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
index c24df0a38..27459ccc1 100644
--- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_EnchantingMenu.h"
 
 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
index 0700e0848..8d5a5602a 100644
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -2,9 +2,15 @@
 #include "UI.h"
 #include "UIScene_EndPoem.h"
 #include "UIBitmapFont.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/StringHelpers.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
index ff10aa70c..1d24f989b 100644
--- a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
-#include <LocalPlayer.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
+#include "..\..\LocalPlayer.h"
 #include "UIScene_FireworksMenu.h"
 
 UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
index 7c7aaeee0..fb17bda44 100644
--- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_FullscreenProgress.h"
-#include <Minecraft.h>
-#include <ProgressRenderer.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ProgressRenderer.h"
 
 
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
index 5f9a5f1de..392221a6f 100644
--- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_FurnaceMenu.h"
 
 UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
index 906110209..f2147cb21 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -2,12 +2,21 @@
 #include "UI.h"
 #include "UIScene_HUD.h"
 #include "BossMobGuiInfo.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
 #include <EnderDragonRenderer.h>
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.World/StringHelpers.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\..\EnderDragonRenderer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
index c8f67fd8b..a0d631723 100644
--- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HelpAndOptionsMenu.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 
 UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
index c618c6c17..f0f6db18a 100644
--- a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\Minecraft.h"
 #include "UIScene_HopperMenu.h"
 
 UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
index c5452df59..ab98e30f9 100644
--- a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 #include "UIScene_HorseInventoryMenu.h"
 
 UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
index 8a3c4e785..e33e24fe7 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HowToPlay.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
index 27a5e2e58..68ac537ee 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameHostOptionsMenu.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
index 7ef79fab1..57acf3458 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameInfoMenu.h"
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
 
 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
index 3cdd17579..d7196849f 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGamePlayerOptionsMenu.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 
 #define CHECKBOXES_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
index 7433f7cd1..47b091052 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -2,6 +2,7 @@
 #include "UI.h"
 #include "UIScene_InventoryMenu.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.World/net.minecraft.world.item.h>
 #include <Minecraft.World/net.minecraft.stats.h>
@@ -14,6 +15,20 @@
 #include <Tutorial/Tutorial.h>
 #include <Tutorial/TutorialMode.h>
 #include <Tutorial/TutorialEnum.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\Lighting.h"
+#include "..\Tutorial\Tutorial.h"
+#include "..\Tutorial\TutorialMode.h"
+#include "..\Tutorial\TutorialEnum.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
index ea7eb8aa2..fb8d57a24 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
@@ -3,7 +3,7 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_InventoryMenu.h"
 
-#include <Minecraft.World/MobEffect.h>
+#include "..\..\..\Minecraft.World\MobEffect.h"
 
 class InventoryMenu;
 
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
index 02a193546..c036f7bf9 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_JoinMenu.h"
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
-#include <Options.h>
-#include <MinecraftServer.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\Options.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
index d52fe2eb8..12b219053 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LeaderboardsMenu.h"
-#include <Leaderboards/LeaderboardManager.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Leaderboards\LeaderboardManager.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
index eac4bf593..bcd4fe873 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "UIScene.h"
-// #include <Leaderboards/LeaderboardManager.h>
-#include <Leaderboards/LeaderboardInterface.h>
+// #include "..\Leaderboards\LeaderboardManager.h"
+#include "..\Leaderboards\LeaderboardInterface.h"
 
 class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
index 349ab1f4c..d4d832284 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LoadMenu.h"
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
-#include <Options.h>
-#include <MinecraftServer.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\Options.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include <Common/Network/Sony/SonyHttp.h>
+#include "Common\Network\Sony\SonyHttp.h"
 #endif
-#include <DLCTexturePack.h>
+#include "..\..\DLCTexturePack.h"
 #if defined(__ORBIS__) || defined(__PSVITA__)
 #include <ces.h>
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index b9083f202..2059c76fa 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -2,20 +2,20 @@
 #include "UI.h"
 #include "UIScene_LoadOrJoinMenu.h"
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.storage.h>
-#include <Minecraft.World/ConsoleSaveFile.h>
-#include <Minecraft.World/ConsoleSaveFileOriginal.h>
-#include <ProgressRenderer.h>
-#include <MinecraftServer.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <Network/SessionInfo.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFile.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\Network\SessionInfo.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include <Common/Network/Sony/SonyHttp.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "Common\Network\Sony\SonyHttp.h"
+#include "Common\Network\Sony\SonyRemoteStorage.h"
 #include "DLCTexturePack.h"
 #endif
 #if defined(__ORBIS__) || defined(__PSVITA__)
diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
index c079d9157..fe743adc2 100644
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Random.h>
-#include <User.h>
-#include <MinecraftServer.h>
+#include "..\..\..\Minecraft.World\Mth.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\User.h"
+#include "..\..\MinecraftServer.h"
 #include "UI.h"
 #include "UIScene_MainMenu.h"
 #ifdef __ORBIS__
diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
index 5e46ad2de..998679cab 100644
--- a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_NewUpdateMessage.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
index 7f4a8e5f3..164eb6c52 100644
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -1,22 +1,31 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_PauseMenu.h"
+<<<<<<< HEAD
 #include <MinecraftServer.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <TexturePackRepository.h>
 #include <TexturePack.h>
 #include <DLCTexturePack.h>
 #include <Minecraft.World/StringHelpers.h>
+=======
+#include "..\..\MinecraftServer.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\DLCTexturePack.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #endif
 
 #ifdef _DURANGO
-#include <Durango/Leaderboards/DurangoStatsDebugger.h>
+#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h"
 #endif
 
 #ifdef __PSVITA__
-#include <PSVita/Network/SonyCommerce_Vita.h>
+#include "PSVita\Network\SonyCommerce_Vita.h"
 #endif
 
 #if defined __PS3__ || defined __ORBIS__
diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
index ea7dd0a8c..0cb6cf2bd 100644
--- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_QuadrantSignin.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 #if defined(__ORBIS__)
-#include <Common/Network/Sony/SonyHttp.h>
+#include "Common\Network\Sony\SonyHttp.h"
 #endif
 
 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
index 0e47659bb..39a0b7c66 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SettingsMenu.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 
 UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
index c7c7768f8..c29bac2d3 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SignEntryMenu.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <MultiPlayerLevel.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 
 UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
index 5f06ba1cc..d4f26ae71 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #elif defined __PSVITA__
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
index 9d9211ee2..e8d760967 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/Definitions.h>
+#include "..\..\..\Minecraft.World\Definitions.h"
 #include "UIScene.h"
 #include "UIControl_PlayerSkinPreview.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
index 0194c1075..f6916d133 100644
--- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_TeleportMenu.h"
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
 #include "TeleportCommand.h"
 
 UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
index 6c9a54260..0a35c8e5b 100644
--- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.h>
+#include "..\..\Minecraft.h"
 #include "UIScene_TradingMenu.h"
 
 UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIString.cpp b/Minecraft.Client/Common/UI/UIString.cpp
index 156a84f85..288fa87a9 100644
--- a/Minecraft.Client/Common/UI/UIString.cpp
+++ b/Minecraft.Client/Common/UI/UIString.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include "UIString.h"
 
diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp
index b87b84f37..5d72ed97c 100644
--- a/Minecraft.Client/Common/UI/UITTFFont.cpp
+++ b/Minecraft.Client/Common/UI/UITTFFont.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/File.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\File.h"
 #include "UITTFFont.h"
 
 UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharacter) 
diff --git a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
index fc1d6b0b8..91f362a3e 100644
--- a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
+++ b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/Slot.h>
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\Slot.h"
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 
 #include "SlotItemControlBase.h"
 #include "SlotProgressControl.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
index 41ecd66cf..3e3faa773 100644
--- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XUI_Chat.h"
-#include <Minecraft.h>
-#include <Gui.h>
+#include "..\..\Minecraft.h"
+#include "..\..\Gui.h"
 
 HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.h b/Minecraft.Client/Common/XUI/XUI_Chat.h
index 9a724ace9..d685e587f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Chat.h
+++ b/Minecraft.Client/Common/XUI/XUI_Chat.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <media/xuiscene_chat.h>
+#include "../media/xuiscene_chat.h"
 #include "XUI_CustomMessages.h"
 
 #define CHAT_LINES_COUNT 10
diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
index d64342c93..9a82a7b3b 100644
--- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
@@ -4,8 +4,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <Minecraft.h>
-#include <Minecraft.World/DisconnectPacket.h>
+#include "..\..\Minecraft.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h
index 11ccdb5d2..360ca0b0a 100644
--- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h
+++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include <media/xuiscene_connectingprogress.h>
+#include "../media/xuiscene_connectingprogress.h"
 
 class CScene_ConnectingProgress : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
index 27ff54e6f..0096da445 100644
--- a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_Control_ComboBox.h"
-#include <Xbox_App.h>
+#include "..\Xbox_App.h"
 
 HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
index 2ba1723d3..074b7300b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\SharedConstants.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
 #include "XUI_Ctrl_BrewProgress.h"
 
 int CXuiCtrlBrewProgress::GetValue()
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
index 0f95638e4..cc5d996f3 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "XUI_Ctrl_BubblesProgress.h"
 
 int CXuiCtrlBubblesProgress::GetValue()
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
index 3253d9f0b..8e514094c 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/FurnaceMenu.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
+#include "..\..\..\Minecraft.World\FurnaceMenu.h"
+#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_BurnProgress.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
index 38ba247cd..82b6c3eda 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlMinecraftSlot class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
index 0d579b39f..dfb9b5ca9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Font.h>
-#include <Lighting.h>
-#include <MultiPlayerLocalPlayer.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Font.h"
+#include "..\..\Lighting.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
 #include "XUI_Scene_Enchant.h"
 #include "XUI_Ctrl_EnchantButton.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
index 07cc20748..8a56a0ead 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
@@ -1,21 +1,21 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
-#include <Minecraft.h>
-#include <ScreenSizeCalculator.h>
-#include <TileEntityRenderDispatcher.h>
-#include <EnchantTableRenderer.h>
-#include <Lighting.h>
-#include <LocalPlayer.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\TileEntityRenderDispatcher.h"
+#include "..\..\EnchantTableRenderer.h"
+#include "..\..\Lighting.h"
+#include "..\..\LocalPlayer.h"
 
 #include "XUI_Scene_Enchant.h"
 
 #include "XUI_Ctrl_EnchantmentBook.h"
-#include <BookModel.h>
-#include <Options.h>
+#include "..\..\BookModel.h"
+#include "..\..\Options.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlEnchantmentBook class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
index eca326033..93da07684 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/Random.h>
+#include "..\..\..\Minecraft.World\Random.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
index b28834617..702ef15d7 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Font.h>
-#include <Lighting.h>
-#include <MultiPlayerLocalPlayer.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Font.h"
+#include "..\..\Lighting.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
 #include "XUI_Scene_Enchant.h"
 #include "XUI_Ctrl_EnchantButton.h"
 #include "XUI_Ctrl_EnchantmentButtonText.h"
-#include <Minecraft.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
+#include "..\..\Minecraft.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
 
 #include <iostream>
 #include <string>
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
index f43295420..b125af39c 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/FurnaceMenu.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
+#include "..\..\..\Minecraft.World\FurnaceMenu.h"
+#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_FireProgress.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
index 926b505a0..3bb334400 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include "XUI_Ctrl_LoadingProgress.h"
-#include <Minecraft.h>
-#include <ProgressRenderer.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ProgressRenderer.h"
 
 int CXuiCtrlLoadingProgress::GetValue()
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
index f37ecabf9..d17eeb089 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
@@ -1,13 +1,21 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <ScreenSizeCalculator.h>
 #include <EntityRenderDispatcher.h>
 #include <Lighting.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\Lighting.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_MinecraftPlayer.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Scene_Inventory.h"
-#include <Options.h>
+#include "..\..\Options.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlMinecraftPlayer class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
index 1da8c6dba..80750deb8 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
@@ -1,18 +1,18 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <ScreenSizeCalculator.h>
-#include <EntityRenderDispatcher.h>
-#include <PlayerRenderer.h>
-#include <HumanoidModel.h>
-#include <Lighting.h>
-#include <Minecraft.World/Class.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\EntityRenderDispatcher.h"
+#include "..\..\PlayerRenderer.h"
+#include "..\..\HumanoidModel.h"
+#include "..\..\Lighting.h"
+#include "..\..\..\Minecraft.World\Class.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "XUI_Ctrl_MinecraftSkinPreview.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Scene_Inventory.h"
-#include <Options.h>
-#include <stubs.h>
-#include <ModelPart.h>
+#include "..\..\Options.h"
+#include "..\..\stubs.h"
+#include "..\..\ModelPart.h"
 
 //#define SKIN_PREVIEW_BOB_ANIM
 #define SKIN_PREVIEW_WALKING_ANIM
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
index 404e15a21..92cc68578 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
@@ -1,10 +1,17 @@
 #pragma once
 
 #include <string>
+<<<<<<< HEAD
 #include <xuiapp.h>
 #include <Textures.h>
 //#include <Xbox/DLC/DLCSkinFile.h>
 #include <Model.h>
+=======
+#include <XuiApp.h>
+#include "..\..\Textures.h"
+//#include "..\..\Xbox\DLC\DLCSkinFile.h"
+#include "..\..\Model.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 using namespace std;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
index bbb22a8c5..84273eb57 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 
-#include <ItemRenderer.h>
-#include <GameRenderer.h>
-#include <TileRenderer.h>
-#include <Lighting.h>
-#include <ScreenSizeCalculator.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/Item.h>
-#include <Minecraft.World/Tile.h>
+#include "..\..\ItemRenderer.h"
+#include "..\..\GameRenderer.h"
+#include "..\..\TileRenderer.h"
+#include "..\..\Lighting.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\..\Minecraft.World\Item.h"
+#include "..\..\..\Minecraft.World\Tile.h"
 #include "XUI_Ctrl_MinecraftSlot.h"
 
 //-----------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
index 6da5a67fa..c43e7fe9e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/MobEffect.h>
+#include "..\..\..\Minecraft.World\MobEffect.h"
 
 class CXuiCtrlMobEffect : public CXuiControlImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
index 2e3099b23..87abbcd35 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Slot.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Slot.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\Minecraft.h"
 
 #include "XUI_Ctrl_SlotItemCtrlBase.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
index 43bf2f64d..7e51c8850 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/AbstractContainerMenu.h>
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
 
 #include "XUI_Ctrl_SlotItemListItem.h"
 #include "XUI_Ctrl_SlotList.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
index 104ab85cc..2e9717107 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include <Minecraft.h>
-#include <ScreenSizeCalculator.h>
-#include <Lighting.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ScreenSizeCalculator.h"
+#include "..\..\Lighting.h"
 #include "XUI_Ctrl_SplashPulser.h"
-#include <Font.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/System.h>
+#include "..\..\Font.h"
+#include "..\..\..\Minecraft.World\Mth.h"
+#include "..\..\..\Minecraft.World\System.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlSplashPulser class
diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
index 421218c1a..bd05ca146 100644
--- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
@@ -2,14 +2,14 @@
 //
 
 #include "stdafx.h"
-#include <Minecraft.World/ByteArrayInputStream.h>
-#include <Minecraft.World/BufferedReader.h>
-#include <Minecraft.World/InputStreamReader.h>
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\..\..\Minecraft.World\ByteArrayInputStream.h"
+#include "..\..\..\Minecraft.World\BufferedReader.h"
+#include "..\..\..\Minecraft.World\InputStreamReader.h"
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
 #include <assert.h>
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_DLCOffers.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #ifdef _XBOX
 #include <xavatar.h>
 #endif
diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
index 5e426e8fe..412446d00 100644
--- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
+++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <media/xuiscene_DLCOffers.h>
-#include <media/xuiscene_DLCMain.h>
+#include "../media\xuiscene_DLCOffers.h"
+#include "../media\xuiscene_DLCMain.h"
 
 
 #include "XUI_CustomMessages.h"
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_Ctrl_4JIcon.h"
-//#include <XUI_Ctrl_DLCPrice.h>
+//#include "XUI_Ctrl_DLCPrice.h"
 
 class CXuiCtrl4JList;
 class CScene_DLCOffers;
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp
index d1f1bae89..434c72fc1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp
@@ -2,8 +2,9 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_Death.h>
+#include "..\XUI\XUI_Death.h"
 #include <assert.h>
+<<<<<<< HEAD
 #include <Minecraft.World/AABB.h>
 #include <Minecraft.World/Vec3.h>
 #include <Minecraft.World/net.minecraft.stats.h>
@@ -21,6 +22,25 @@
 #include <Options.h>
 #include <LocalPlayer.h>
 #include <Minecraft.World/compression.h>
+=======
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\..\Minecraft.Client\StatsCounter.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.World\ChunkSource.h"
+#include "..\..\..\Minecraft.Client\ProgressRenderer.h"
+#include "..\..\..\Minecraft.Client\GameRenderer.h"
+#include "..\..\..\Minecraft.Client\LevelRenderer.h"
+#include "..\..\..\Minecraft.World\Pos.h"
+#include "..\..\..\Minecraft.World\Dimension.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\..\Minecraft.World\compression.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.h b/Minecraft.Client/Common/XUI/XUI_Death.h
index c5b4abdc9..3164f59d0 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.h
+++ b/Minecraft.Client/Common/XUI/XUI_Death.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_death.h>
+=======
+#include "../media/xuiscene_Death.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_CustomMessages.h"
 
 #define BUTTON_DEATH_RESPAWN		0
diff --git a/Minecraft.Client/Common/XUI/XUI_Debug.h b/Minecraft.Client/Common/XUI/XUI_Debug.h
index 212bcf0da..1fa6d3c86 100644
--- a/Minecraft.Client/Common/XUI/XUI_Debug.h
+++ b/Minecraft.Client/Common/XUI/XUI_Debug.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_debug.h>
+#include "../media/xuiscene_debug.h"
 
 class CScene_Debug : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
index 60b46b8a9..56b41267e 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Common/GameRules/ConsoleGameRules.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\Common\GameRules\ConsoleGameRules.h"
 #include "XUI_DebugItemEditor.h"
 
 #ifdef _DEBUG_MENUS_ENABLED	
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
index 1faca7d81..2e2f5b5ae 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
-#include <media/xuiscene_debug_item_editor.h>
+#include "../media/xuiscene_debug_item_editor.h"
 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include <Minecraft.World/ItemInstance.h>
+#include "..\..\..\Minecraft.World\ItemInstance.h"
 
 class CScene_DebugItemEditor : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
index 8373ef700..4dd805033 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
@@ -1,32 +1,41 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <MultiPlayerLevel.h>
 #include <GameMode.h>
 #include <SurvivalMode.h>
 #include <CreativeMode.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\MultiplayerLevel.h"
+#include "..\..\GameMode.h"
+#include "..\..\SurvivalMode.h"
+#include "..\..\CreativeMode.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "ClientConnection.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/com.mojang.nbt.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/ConsoleSaveFileIO.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.enchantment.h>
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
+#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
 #include "XUI_DebugOverlay.h"
-#include <Minecraft.Client/GameRenderer.h>
-#include <MinecraftServer.h>
-#include <Common/Tutorial/Tutorial.h>
-#include <Minecraft.World/net.minecraft.commands.common.h>
-#include <Minecraft.World/ConsoleSaveFileOriginal.h>
+#include "..\..\..\Minecraft.Client\GameRenderer.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
 
 #ifdef _DEBUG_MENUS_ENABLED	
 HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
index 017bb0659..ed5f85c2a 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
@@ -1,14 +1,14 @@
 #pragma once
 using namespace std;
-#include <media/xuiscene_debugoverlay.h>
+#include "../media/xuiscene_debugoverlay.h"
 
 #define DEBUG_OVERLAY_UPDATE_TIME_PERIOD 10000
 
 class RegionFile;
 class DataOutputStream;
 class ConsoleSaveFile;
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/Entity.h>
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\Entity.h"
 
 class CScene_DebugOverlay : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
index a90e890e3..66279d1f5 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XUI_DebugSchematicCreator.h"
-#include <Minecraft.World/ChunkSource.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\..\..\Minecraft.World\ChunkSource.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
 
 #ifndef _CONTENT_PACKAGE
 HRESULT CScene_DebugSchematicCreator::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
index 1ea8e22a7..b502d1105 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Media/xuiscene_debug_schematic_create.h>
+#include "..\Media\xuiscene_debug_schematic_create.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include <Common/GameRules/ConsoleSchematicFile.h>
+#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
 
 class CScene_DebugSchematicCreator : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
index 6606b5704..8044f227a 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
@@ -1,12 +1,17 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XUI_DebugSetCamera.h"
-#include <Minecraft.World/ChunkSource.h>
+#include "..\..\..\Minecraft.World\ChunkSource.h"
 
-// #include <Xbox/4JLibs/inc/4J_Input.h>
+// #include "..\..\Xbox\4JLibs\inc\4J_Input.h"
 
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #ifndef _CONTENT_PACKAGE
 HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
index a654003dc..1bc662e96 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Media/xuiscene_debug_set_camera.h>
+#include "..\Media\xuiscene_debug_set_camera.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include <Common/GameRules/ConsoleSchematicFile.h>
+#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
 
 class CScene_DebugSetCamera : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
index 2a2497991..aaa3b06f6 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 #include "XUI_DebugTips.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.h b/Minecraft.Client/Common/XUI/XUI_DebugTips.h
index 067e6376b..5a0ac47f8 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugTips.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_debugtips.h>
+=======
+#include "../media/xuiscene_DebugTips.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
index 1a7a5eefd..f66c0d70c 100644
--- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
@@ -4,10 +4,10 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <Minecraft.h>
-#include <ProgressRenderer.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Common/Tutorial/TutorialMode.h>
+#include "..\..\Minecraft.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
index f55626494..271a57813 100644
--- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
+++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
@@ -1,6 +1,6 @@
 #pragma once 
-#include <media/xuiscene_fullscreenprogress.h>
-#include <Minecraft.World/C4JThread.h>
+#include "../media/xuiscene_fullscreenprogress.h"
+#include "..\..\..\Minecraft.World\C4JThread.h"
 
 #define ERROR_FULLSCREENPROGRESS_
 
diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
index baf6be526..4329ea641 100644
--- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "XUI_HUD.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <Gui.h>
 #include <MultiPlayerLocalPlayer.h>
@@ -7,6 +8,15 @@
 #include <Minecraft.World/Random.h>
 #include <Minecraft.World/net.minecraft.world.effect.h>
 #include <Minecraft.World/net.minecraft.world.level.material.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\Gui.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.h b/Minecraft.Client/Common/XUI/XUI_HUD.h
index e84b85162..1bf6bcbf7 100644
--- a/Minecraft.Client/Common/XUI/XUI_HUD.h
+++ b/Minecraft.Client/Common/XUI/XUI_HUD.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <media/xuiscene_hud.h>
+#include "../media/xuiscene_hud.h"
 #include "XUI_CustomMessages.h"
 
 #define CHAT_LINES_COUNT 10
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
index 3d8176961..9ba49e9d4 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
@@ -4,7 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_HelpAndOptions.h>
+#include "..\XUI\XUI_HelpAndOptions.h"
 
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h
index f35a3ca1e..9ece2cd95 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_helpandoptions.h>
+#include "../media/xuiscene_helpandoptions.h"
 #include "XUI_CustomMessages.h"
 
 #define BUTTON_HAO_CHANGESKIN			0
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
index 8443392ad..e3124ae41 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
@@ -1,12 +1,18 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_HelpControls.h>
+#include "..\XUI\XUI_HelpControls.h"
 #include "XUI_Ctrl_4JList.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.level.h>
 #include <Minecraft.World/LevelData.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\LevelData.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #define ALIGN_START		0
 #define ALIGN_END		1
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.h b/Minecraft.Client/Common/XUI/XUI_HelpControls.h
index 598cc6365..4d14953b5 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpControls.h
+++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_controls.h>
+#include "../media/xuiscene_controls.h"
 #include "XUI_CustomMessages.h"
 
 class CXuiCtrl4JList;
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
index 18512db6e..e973286eb 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
+++ b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
@@ -5,7 +5,7 @@
 #define MAX_CREDIT_STRINGS		360
 // 213
 
-#include <UI/UIStructs.h>
+#include "..\UI\UIStructs.h"
 
 class CScene_Credits : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
index 49bee678e..5c750d030 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_HelpHowToPlay.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\XUI\XUI_HelpHowToPlay.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h
index 7428c797a..8a37e9255 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h
+++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_howtoplay.h>
+#include "../media/xuiscene_howtoplay.h"
 #include "XUI_CustomMessages.h"
 
 enum EHowToPlayTextControls
diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
index 5cc4bbd75..14046f203 100644
--- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_HowToPlayMenu.h>
-#include <XUI/XUI_HelpHowToPlay.h>
+#include "..\XUI\XUI_HowToPlayMenu.h"
+#include "..\XUI\XUI_HelpHowToPlay.h"
 
 // strings for buttons in the list				  
 unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]=
diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h
index 8f14e29d2..ba334c80c 100644
--- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h
+++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_howtoplay_menu.h>
+#include "../media/xuiscene_howtoplay_menu.h"
 #include "XUI_CustomMessages.h"
 
 class CScene_HowToPlayMenu : public CXuiSceneImpl
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
index bead7166d..f05617451 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_InGameHostOptions.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
index 68e3fa41c..cdc99f7c1 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Media/xuiscene_ingame_host_options.h>
+#include "..\Media\xuiscene_ingame_host_options.h"
 
 class CScene_InGameHostOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
index 33965f865..4839013c9 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
@@ -2,18 +2,18 @@
 
 #include <assert.h>
 #include "XUI_InGameInfo.h"
-#include <ServerPlayer.h>
-#include <PlayerConnection.h>
-#include <PlayerList.h>
-#include <MinecraftServer.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <PlayerRenderer.h>
+#include "..\..\ServerPlayer.h"
+#include "..\..\PlayerConnection.h"
+#include "..\..\PlayerList.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\PlayerRenderer.h"
 #include "XUI_InGamePlayerOptions.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 
 #define IGNORE_KEYPRESS_TIMERID 0
 #define TOOLTIP_TIMERID 1
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h
index 3d6ccd94e..8b685aaf7 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.h
+++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 using namespace std;
-#include <media/xuiscene_ingameinfo.h>
+#include "../media/xuiscene_ingameinfo.h"
 #include "XUI_CustomMessages.h"
 
 class INetworkPlayer;
diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
index 365a4682b..156cd0925 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_InGamePlayerOptions.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 #include "XUI_InGameInfo.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
index f3010fd5f..87b9de138 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Media/xuiscene_ingame_player_options.h>
+#include "..\Media\xuiscene_ingame_player_options.h"
 
 class CScene_InGamePlayerOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.cpp b/Minecraft.Client/Common/XUI/XUI_Intro.cpp
index 876801004..997abe5d5 100644
--- a/Minecraft.Client/Common/XUI/XUI_Intro.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Intro.cpp
@@ -4,7 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_Intro.h>
+#include "..\XUI\XUI_Intro.h"
 
 #define TIMELINE_NORMAL		0
 #define TIMELINE_ESRBFADE	1
diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.h b/Minecraft.Client/Common/XUI/XUI_Intro.h
index 97977c017..f896faed0 100644
--- a/Minecraft.Client/Common/XUI/XUI_Intro.h
+++ b/Minecraft.Client/Common/XUI/XUI_Intro.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_intro.h>
+#include "../media/xuiscene_intro.h"
 
 class CScene_Intro : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
index a84991911..428b3e88a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
@@ -2,8 +2,8 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include "XUI_Leaderboards.h"
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/Item.h>
+#include "..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\Minecraft.World\Item.h"
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_XZP_Icons.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
index 83daeed4a..e06f13e18 100644
--- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
+++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "XUI_Helper.h"
-#include <media/xuiscene_leaderboards.h>
+#include "../media/xuiscene_leaderboards.h"
 
-#include <Leaderboards/LeaderboardManager.h>
+#include "..\Leaderboards\LeaderboardManager.h"
 
 class CXuiCtrlCraftIngredientSlot;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
index e6b46a9d7..7f32ff89e 100644
--- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
@@ -2,29 +2,29 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Minecraft.World/ConsoleSaveFileIO.h>
-#include <LocalPlayer.h>
-#include <Minecraft.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <MinecraftServer.h>
-#include <Options.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\Options.h"
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
-#include <Minecraft.World/LevelSettings.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <GameRules/ConsoleGameRules.h>
-#include <StringTable.h>
-#include <DLCTexturePack.h>
+#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\GameRules\ConsoleGameRules.h"
+#include "..\..\StringTable.h"
+#include "..\..\DLCTexturePack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h
index 44acdaf22..61e934b7e 100644
--- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.h
+++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <media/xuiscene_load_settings.h>
+#include "../media/xuiscene_load_settings.h"
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_CustomMessages.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
index 93a0feca7..7b9c1a56e 100644
--- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
@@ -4,21 +4,21 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_MainMenu.h>
-#include <Minecraft.Client/SurvivalMode.h>
-#include <Minecraft.World/ConsoleSaveFileIO.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <User.h>
-//#include <XUI_CreateLoad.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Random.h>
-#include <MinecraftServer.h>
-#include <Minecraft.h>
-#include <Options.h>
-#include <Font.h>
-#include <Common/GameRules/ConsoleGameRules.h>
+#include "..\XUI\XUI_MainMenu.h"
+#include "..\..\..\Minecraft.Client\SurvivalMode.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\User.h"
+//#include "XUI_CreateLoad.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\Font.h"
+#include "..\..\Common\GameRules\ConsoleGameRules.h"
 
 #define DLC_INSTALLED_TIMER_ID 1
 #define DLC_INSTALLED_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.h b/Minecraft.Client/Common/XUI/XUI_MainMenu.h
index 99399a96b..2e4279e42 100644
--- a/Minecraft.Client/Common/XUI/XUI_MainMenu.h
+++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_main.h>
+#include "../media/xuiscene_main.h"
 #include "XUI_CustomMessages.h"
 
 #define BUTTON_PLAYGAME			0
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
index 5ff0c0e48..b3608b068 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
@@ -1,21 +1,21 @@
 #include "stdafx.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_Controls.h"
-#include <MinecraftServer.h>
-#include <Minecraft.h>
-#include <Options.h>
-#include <Minecraft.World/LevelSettings.h>
+#include "..\..\MinecraftServer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\..\Minecraft.World\LevelSettings.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/LevelType.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <DLC/DLCLocalisationFile.h>
-#include <StringTable.h>
-#include <DLCTexturePack.h>
+#include "..\..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\..\Minecraft.World\IntCache.h"
+#include "..\..\..\Minecraft.World\LevelType.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\DLC\DLCLocalisationFile.h"
+#include "..\..\StringTable.h"
+#include "..\..\DLCTexturePack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
index eb158293c..5b4e6ef7f 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Media/xuiscene_multi_create.h>
+#include "..\Media\xuiscene_multi_create.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
index 55b56cc3f..bbfa243b2 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
@@ -2,12 +2,12 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/Difficulty.h>
+#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\..\Minecraft.World\Difficulty.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
index c964a96ae..9664640b3 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
@@ -2,7 +2,7 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Media/xuiscene_multi_gameinfo.h>
+#include "..\Media\xuiscene_multi_gameinfo.h"
 
 class FriendSessionInfo;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
index bd2524ccb..73f25da58 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
@@ -2,30 +2,30 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Minecraft.World/ConsoleSaveFileIO.h>
-#include <LocalPlayer.h>
-#include <Minecraft.h>
-#include <ProgressRenderer.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/InputOutputStream.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
+#include "..\..\LocalPlayer.h"
+#include "..\..\Minecraft.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\ArrayWithLength.h"
+#include "..\..\..\Minecraft.World\File.h"
+#include "..\..\..\Minecraft.World\InputOutputStream.h"
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
 #include "XUI_MultiGameCreate.h"
-#include <MinecraftServer.h>
-#include <Options.h>
+#include "..\..\MinecraftServer.h"
+#include "..\..\Options.h"
 
-#include <GameRules/LevelGenerationOptions.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <Minecraft.World/LevelSettings.h>
+#include "..\GameRules\LevelGenerationOptions.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\..\Minecraft.World\LevelSettings.h"
 
 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3
 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
index 099cb6798..e91fbac23 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Media/xuiscene_multi_joinload.h>
+#include "..\Media\xuiscene_multi_joinload.h"
 #include "XUI_CustomMessages.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
index 073b802fb..086561110 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
-#include <TexturePackRepository.h>
-#include <Minecraft.h>
+#include "..\..\TexturePackRepository.h"
+#include "..\..\Minecraft.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
index 3b69788f8..928762405 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_multi_launch_more_options.h>
+#include "..\Media\xuiscene_multi_launch_more_options.h"
 
 class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
index 9a3979bdf..49b524ffe 100644
--- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
@@ -1,9 +1,9 @@
 
 
 #include "stdafx.h"
- // #include <XUI_Ctrl_4JIcon.h>
+ // #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_NewUpdateMessage.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 
 HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
index 026d500cc..8c4fbb36c 100644
--- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
+++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_NewUpdateMessage.h>
+#include "../media\xuiscene_NewUpdateMessage.h"
 
 class CScene_NewUpdateMessage : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
index b03db7b1a..76b820d3e 100644
--- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_PartnernetPassword.h"
-#include <XUI/XUI_Ctrl_4JList.h>
+#include "..\XUI\XUI_Ctrl_4JList.h"
 
 #ifdef _CONTENT_PACKAGE
 #ifndef _FINAL_BUILD
diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
index c2109aa9d..b05206c0e 100644
--- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
+++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Media/xuiscene_partnernetpassword.h>
+#include "..\Media\xuiscene_partnernetpassword.h"
 #include "XUI_Ctrl_4JEdit.h"
 
 #ifdef _CONTENT_PACKAGE
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
index b6865bfc8..3ca972331 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
@@ -4,6 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
+<<<<<<< HEAD
 #include <Minecraft.World/AABB.h>
 #include <Minecraft.World/Vec3.h>
 #include <Minecraft.World/net.minecraft.stats.h>
@@ -21,6 +22,25 @@
 #include <TexturePackRepository.h>
 #include <TexturePack.h>
 #include <DLCTexturePack.h>
+=======
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\..\Minecraft.Client\StatsCounter.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\MultiPlayerLevel.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
+#include "..\..\..\Minecraft.World\compression.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\DLCTexturePack.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #define IGNORE_KEYPRESS_TIMERID 0
 #define IGNORE_KEYPRESS_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
index 8299bc412..df779b9ed 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
@@ -1,6 +1,11 @@
 #pragma once 
+<<<<<<< HEAD
 #include <media/xuiscene_pause.h>
 #include <UI/IUIScene_PauseMenu.h>
+=======
+#include "../media/xuiscene_Pause.h"
+#include "..\UI\IUIScene_PauseMenu.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_CustomMessages.h"
 
 #define BUTTON_PAUSE_RESUMEGAME		0
diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
index d98f3eb7b..c1e06c0d1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
@@ -4,19 +4,19 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_Reinstall.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.Client/LocalPlayer.h>
-#include <MinecraftServer.h>
-#include <ProgressRenderer.h>
-#include <Minecraft.World/DisconnectPacket.h>
-#include <Minecraft.h>
-#include <Options.h>
+#include "..\XUI\XUI_Reinstall.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\..\Minecraft.Client\StatsCounter.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.Client\LocalPlayer.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\ProgressRenderer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Options.h"
 
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Common/XUI/XUI_Reinstall.h
index 148e50704..7855a3410 100644
--- a/Minecraft.Client/Common/XUI/XUI_Reinstall.h
+++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_reinstall.h>
+=======
+#include "../media/xuiscene_Reinstall.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #define BUTTON_REINSTALL_THEME		0
 #define BUTTON_REINSTALL_GAMERPIC1	1
diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
index 3e2e853c5..7c8160337 100644
--- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include <assert.h>
-#include <XUI/XUI_SaveMessage.h>
+#include "..\XUI\XUI_SaveMessage.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h
index b41a047b1..3e84541c8 100644
--- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.h
+++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_savemessage.h>
+#include "../media/xuiscene_savemessage.h"
 
 class CScene_SaveMessage : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
index 7358c5974..10369d5ea 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
@@ -3,22 +3,22 @@
 #include <xuiapp.h>
 #include <assert.h>
 
-#include <Minecraft.World/Player.h>
-#include <Minecraft.Client/LocalPlayer.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/GameMode.h>
-#include <Minecraft.World/AbstractContainerMenu.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/FurnaceRecipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/ArmorRecipes.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Player.h"
+#include "..\..\..\Minecraft.Client\LocalPlayer.h"
+#include "..\..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\..\Minecraft.Client\GameMode.h"
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\Minecraft.World\FurnaceRecipes.h"
+#include "..\..\..\Minecraft.World\Recipy.h"
+#include "..\..\..\Minecraft.World\Recipes.h"
+#include "..\..\..\Minecraft.World\ArmorRecipes.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
 
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_SlotItem.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
index 370218b45..ca191db5b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <UI/IUIScene_AbstractContainerMenu.h>
+#include "..\UI\IUIScene_AbstractContainerMenu.h"
 #include "XUI_CustomMessages.h"
-#include <Common/Tutorial/TutorialEnum.h>
+#include "..\..\Common\Tutorial\TutorialEnum.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlSlotItem;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
index b0ac6b6c4..4a8617b47 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/TutorialEnum.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Anvil.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
index 01d787abe..2b16c8ab8 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
@@ -1,9 +1,9 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_anvil.h>
+#include "..\Media\xuiscene_anvil.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include <UI/IUIScene_AnvilMenu.h>
-#include <Common/XUI/XUI_Ctrl_4JEdit.h>
+#include "..\UI\IUIScene_AnvilMenu.h"
+#include "Common\XUI\XUI_Ctrl_4JEdit.h"
 
 #define ANVIL_UPDATE_TIMER_ID (10)
 #define ANVIL_UPDATE_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
index 565962162..5321df349 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
@@ -1,24 +1,33 @@
 #include "stdafx.h"
 
 #include <assert.h>
+<<<<<<< HEAD
 #include <MultiPlayerLevel.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <StatsCounter.h>
 #include <Minecraft.World/StringHelpers.h>
 #include <Minecraft.World/net.minecraft.stats.h>
 #include <Minecraft.h>
+=======
+#include "..\..\MultiplayerLevel.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\StatsCounter.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/LevelData.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\LevelData.h"
 #include "XUI_CustomMessages.h"
-#include <Minecraft.World/Dimension.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <GameMode.h>
-#include <EnderDragonRenderer.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <DLCTexturePack.h>
+#include "..\..\..\Minecraft.World\Dimension.h"
+#include "..\..\..\Minecraft.World\SharedConstants.h"
+#include "..\..\GameMode.h"
+#include "..\..\EnderDragonRenderer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\DLCTexturePack.h"
 
 #define PRESS_START_TIMER 0
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
index 6a6469b7a..1a5b5d876 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <media/xuiscene_base.h>
+#include "../media/xuiscene_base.h"
 #include "XUI_Ctrl_SlotItem.h"
 #include "XUI_CustomMessages.h"
-#include <UI/UIEnums.h>
-#include <Minecraft.World/SoundTypes.h>
+#include "..\UI\UIEnums.h"
+#include "..\..\..\Minecraft.World\SoundTypes.h"
 
 #define BUTTON_TOOLTIP_A	0
 #define BUTTON_TOOLTIP_B	1
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
index a82edc4d5..cf6009661 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/TutorialEnum.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_BrewingStand.h"
 #include "XUI_Ctrl_BrewProgress.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
index 5a0610537..370b6b189 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_brewingstand.h>
+#include "..\Media\xuiscene_brewingstand.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include <UI/IUIScene_BrewingMenu.h>
+#include "..\UI\IUIScene_BrewingMenu.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlBrewProgress;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
index 995c22ad5..ecc5c9f3a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
@@ -1,15 +1,21 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/Container.h>
 #include <Minecraft.World/ContainerMenu.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\Minecraft.World\Container.h"
+#include "..\..\..\Minecraft.World\ContainerMenu.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Container.h"
 #include "XUI_Ctrl_SlotItemListItem.h"
 #include "XUI_Ctrl_SlotItem.h"
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/TutorialEnum.h>
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
 
 // The height of one row of slots
 //#define ROW_HEIGHT 42.0f - comes from the pointer height in the xui
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
index 409964b55..475a6974d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <Media/xuiscene_container.h>
+#include "..\Media\xuiscene_container.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include <UI/IUIScene_ContainerMenu.h>
+#include "..\UI\IUIScene_ContainerMenu.h"
 
 //--------------------------------------------------------------------------------------
 // Scene implementation class.
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
index 2536d99a9..e9ffdb316 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
@@ -4,6 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
+<<<<<<< HEAD
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.item.h>
 #include <Minecraft.World/net.minecraft.world.item.crafting.h>
@@ -14,6 +15,18 @@
 #include <Common/Tutorial/TutorialMode.h>
 #include <Common/Tutorial/TutorialEnum.h>
 #include <Minecraft.h>
+=======
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_Ctrl_SlotList.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
index c58b2b984..0c6e22ff7 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
@@ -1,14 +1,14 @@
 #pragma once
 using namespace std;
 
-#include <media/xuiscene_craftingpanel_2x2.h>
+#include "../media/xuiscene_craftingpanel_2x2.h"
 #include "XUI_Ctrl_MinecraftSlot.h"
-#include <Minecraft.World/Recipy.h> 
+#include "..\..\..\Minecraft.World\Recipy.h" 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
-#include <Minecraft.World/Item.h>
+#include "..\..\..\Minecraft.World\Item.h"
 #include "XUI_CustomMessages.h"
-#include <Common/Tutorial/TutorialEnum.h>
-#include <UI/IUIScene_CraftingMenu.h>
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\UI\IUIScene_CraftingMenu.h"
 
 class CXuiCtrlSlotList;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
index a11ff453c..7d8f36ea1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
@@ -1,16 +1,25 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/AbstractContainerMenu.h>
-#include <Minecraft.World/Slot.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "..\..\..\Minecraft.World\Slot.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
 
+<<<<<<< HEAD
 //#include <Minecraft.World/net.minecraft.stats.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Common/Tutorial/Tutorial.h>
 #include <Common/Tutorial/TutorialMode.h>
 #include <Common/Tutorial/TutorialEnum.h>
 #include <Minecraft.h>
+=======
+//#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SlotList.h"
 
 #include "XUI_Scene_Enchant.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
index 81c63923c..5cab04a40 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
@@ -1,20 +1,20 @@
 #pragma once
 using namespace std;
 
-#include <Media/xuiscene_enchant.h>
+#include "..\Media\xuiscene_enchant.h"
 
-#include <BookModel.h>
+#include "..\..\BookModel.h"
 
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_EnchantmentBook.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include <UI/IUIScene_EnchantingMenu.h>
+#include "..\UI\IUIScene_EnchantingMenu.h"
 #include "XUI_CustomMessages.h"
 
 #include "XUI_Scene_Enchant.h"
 
-#include <Minecraft.World/AbstractContainerMenu.h>
-#include <Minecraft.World/SimpleContainer.h>
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "..\..\..\Minecraft.World\SimpleContainer.h"
 
 class Level;
 class CXuiCtrlEnchantmentButton;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
index e3687d4b6..d6ff25946 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
@@ -1,11 +1,20 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/FurnaceMenu.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Common/Tutorial/Tutorial.h>
 #include <Common/Tutorial/TutorialMode.h>
 #include <Common/Tutorial/TutorialEnum.h>
 #include <Minecraft.h>
+=======
+#include "..\..\..\Minecraft.World\FurnaceMenu.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_BurnProgress.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
index 455281c14..22cbf262e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_furnace.h>
+#include "..\Media\xuiscene_furnace.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include <UI/IUIScene_FurnaceMenu.h>
+#include "..\UI\IUIScene_FurnaceMenu.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlFireProgress;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
index d5393406f..9f176d678 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.world.inventory.h>
 #include <Minecraft.World/net.minecraft.stats.h>
 #include <Minecraft.World/net.minecraft.world.effect.h>
@@ -8,6 +9,16 @@
 #include <Common/Tutorial/TutorialMode.h>
 #include <Common/Tutorial/TutorialEnum.h>
 #include <Minecraft.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Controls.h"
 #include "XUI_Scene_Inventory.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
index 4e5f817b6..2a7b305c1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
@@ -1,9 +1,9 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_inventory.h>
+#include "..\Media\xuiscene_inventory.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include <UI/IUIScene_InventoryMenu.h>
+#include "..\UI\IUIScene_InventoryMenu.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
index 6bf50c21d..245da2e42 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
@@ -1,26 +1,38 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/Slot.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\..\..\Minecraft.World\Container.h"
+#include "..\..\..\Minecraft.World\Slot.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/net.minecraft.stats.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Common/Tutorial/Tutorial.h>
 #include <Common/Tutorial/TutorialMode.h>
 #include <Minecraft.h>
+=======
+#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Minecraft.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Ctrl_SlotItem.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_SlotItemListItem.h"
 
+<<<<<<< HEAD
 #include <Common/Potion_Macros.h>
+=======
+#include "..\..\Common\Potion_macros.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneInventoryCreative::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
index b53689fbc..bb3ff9767 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
@@ -1,13 +1,13 @@
 #pragma once
 using namespace std;
 
-#include <Media/xuiscene_inventory_creative.h>
+#include "..\Media\xuiscene_inventory_creative.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include <Minecraft.World/AbstractContainerMenu.h>
-#include <Minecraft.World/SimpleContainer.h>
+#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "..\..\..\Minecraft.World\SimpleContainer.h"
 
-#include <UI/IUIScene_CreativeMenu.h>
+#include "..\UI\IUIScene_CreativeMenu.h"
 
 #include <vector>
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
index c3e6da322..fec134609 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/TutorialEnum.h>
-#include <Minecraft.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "..\..\Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Trading.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\JavaMath.h"
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneTrading::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
index cd93546ca..72194cbce 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_trading.h>
-#include <UI/IUIScene_TradingMenu.h>
+#include "..\Media\xuiscene_trading.h"
+#include "..\UI\IUIScene_TradingMenu.h"
 
 #define TRADING_UPDATE_TIMER_ID (10)
 #define TRADING_UPDATE_TIMER_TIME (50)
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
index 5a31f4195..0ece3afc4 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
@@ -1,13 +1,19 @@
 #include "stdafx.h"
 
+<<<<<<< HEAD
 #include <Minecraft.World/DispenserTileEntity.h>
 #include <Minecraft.World/TrapMenu.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\Minecraft.World\DispenserTileEntity.h"
+#include "..\..\..\Minecraft.World\TrapMenu.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Trap.h"
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/TutorialEnum.h>
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Common\Tutorial\TutorialEnum.h"
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneTrap::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
index ff1dedf35..3008a7ca3 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include <Media/xuiscene_trap.h>
+#include "..\Media\xuiscene_trap.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include <UI/IUIScene_DispenserMenu.h>
+#include "..\UI\IUIScene_DispenserMenu.h"
 #include "XUI_CustomMessages.h"
 
 class Container;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
index 7c50aa3bc..c0b0f1071 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Minecraft.h>
 #include <Common/Tutorial/TutorialMode.h>
 #include <Font.h>
@@ -9,6 +10,15 @@
 #include <Minecraft.World/SharedConstants.h>
 #include <Minecraft.World/StringHelpers.h>
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\Minecraft.h"
+#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Font.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\..\Minecraft.World\SharedConstants.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Scene_Win.h"
 
 BYTE CScene_Win::s_winUserIndex = 0;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h
index cf392befe..ef9d8c623 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_win.h>
+=======
+#include "../media/xuiscene_Win.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_CustomMessages.h"
 
 class CScene_Win : public CXuiSceneImpl
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
index 6605ab5a1..c6dc7118f 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_SettingsAll.h>
+#include "..\XUI\XUI_SettingsAll.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h
index d0ec42ff7..b76727117 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_settings_All.h>
+=======
+#include "../media/xuiscene_settings_all.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
index ff0d990e7..0f0fe2e30 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <XUI/XUI_SettingsAudio.h>
+#include "..\XUI\XUI_SettingsAudio.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h
index 7761f909a..27aaebfc9 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_settings_Audio.h>
+=======
+#include "../media/xuiscene_settings_audio.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
index fa1ee6b76..7e2835a27 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_SettingsControl.h>
+#include "..\XUI\XUI_SettingsControl.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h
index dc6f8e1ae..bb92c7431 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_settings_Control.h>
+=======
+#include "../media/xuiscene_settings_control.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
index 10a0c8e89..48a933e27 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_SettingsGraphics.h>
+#include "..\XUI\XUI_SettingsGraphics.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h
index 0e84fbf88..b79172325 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.h
@@ -1,6 +1,10 @@
 #pragma once
 
+<<<<<<< HEAD
 #include <media/xuiscene_settings_Graphics.h>
+=======
+#include "../media/xuiscene_settings_graphics.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
index 5d1eadc5a..526847c7c 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_SettingsOptions.h>
+#include "..\XUI\XUI_SettingsOptions.h"
 
 int CScene_SettingsOptions::m_iDifficultySettingA[4]=
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h
index 65f602e64..020e76536 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_settings_options.h>
+#include "../media/xuiscene_settings_options.h"
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
index 75c340a7b..da95d084d 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include <XUI/XUI_SettingsUI.h>
+#include "..\XUI\XUI_SettingsUI.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.h b/Minecraft.Client/Common/XUI/XUI_SettingsUI.h
index 90b0ed8e7..12bffead5 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.h
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_settings_UI.h>
+#include "../media/xuiscene_settings_UI.h"
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
index 6341a69e5..f13944e16 100644
--- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <MultiPlayerLevel.h>
 #include <Minecraft.World/SignTileEntity.h>
 #include <Minecraft.World/Entity.h>
@@ -6,6 +7,15 @@
 #include <Minecraft.Client/LocalPlayer.h>
 #include <Minecraft.Client/ClientConnection.h>
 #include <Minecraft.Client/MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\..\MultiplayerLevel.h"
+#include "..\..\..\Minecraft.World\SignTileEntity.h"
+#include "..\..\..\Minecraft.World\Entity.h"
+#include "..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\Minecraft.Client\LocalPlayer.h"
+#include "..\..\..\Minecraft.Client\ClientConnection.h"
+#include "..\..\..\Minecraft.Client\MultiPlayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_SignEntry.h"
 
 HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.h b/Minecraft.Client/Common/XUI/XUI_SignEntry.h
index e9cc36f8a..4f8c44d26 100644
--- a/Minecraft.Client/Common/XUI/XUI_SignEntry.h
+++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <media/xuiscene_signentry.h>
+#include "../media/xuiscene_signentry.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
index 5152214ad..dbbb388ce 100644
--- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
+++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <media/xuiscene_skinselect.h>
+#include "../media/xuiscene_skinselect.h"
 #include "XUI_CustomMessages.h"
-#include <Minecraft.World/Definitions.h>
-#include <Textures.h>
+#include "..\..\..\Minecraft.World\Definitions.h"
+#include "..\..\Textures.h"
 
 class DLCPack;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
index 0a6328e95..f237e7d87 100644
--- a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
@@ -4,16 +4,16 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <XUI/XUI_SocialPost.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.Client/SurvivalMode.h>
-#include <Minecraft.Client/CreateWorldScreen.h>
-#include <Minecraft.World/ConsoleSaveFileIO.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <LocalPlayer.h>
+#include "..\XUI\XUI_SocialPost.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\SharedConstants.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\..\Minecraft.Client\SurvivalMode.h"
+#include "..\..\..\Minecraft.Client\CreateWorldScreen.h"
+#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
+#include "..\..\..\Minecraft.World\AABB.h"
+#include "..\..\..\Minecraft.World\Vec3.h"
+#include "..\..\LocalPlayer.h"
 
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Common/XUI/XUI_SocialPost.h
index 27a11cb82..0dd37fa68 100644
--- a/Minecraft.Client/Common/XUI/XUI_SocialPost.h
+++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_socialpost.h>
+#include "../media\xuiscene_socialpost.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
index 14082ad33..1d6ac3bf6 100644
--- a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
@@ -2,18 +2,18 @@
 
 #include <assert.h>
 #include "XUI_Teleport.h"
-#include <ServerPlayer.h>
-#include <PlayerConnection.h>
-#include <PlayerList.h>
-#include <MinecraftServer.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <PlayerRenderer.h>
+#include "..\..\ServerPlayer.h"
+#include "..\..\PlayerConnection.h"
+#include "..\..\PlayerList.h"
+#include "..\..\MinecraftServer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\PlayerRenderer.h"
 #include "XUI_InGamePlayerOptions.h"
-#include <Minecraft.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <ClientConnection.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "..\..\Minecraft.h"
+#include "..\..\MultiPlayerLocalPlayer.h"
+#include "..\..\ClientConnection.h"
+#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
 #include "TeleportCommand.h"
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.h b/Minecraft.Client/Common/XUI/XUI_Teleport.h
index d7d5eb549..cf60eab0d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Teleport.h
+++ b/Minecraft.Client/Common/XUI/XUI_Teleport.h
@@ -1,6 +1,6 @@
 #pragma once
 using namespace std;
-#include <media/xuiscene_teleportmenu.h>
+#include "../media/xuiscene_teleportmenu.h"
 #include "XUI_CustomMessages.h"
 
 class INetworkPlayer;
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
index 04edcf993..1352ee10d 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
@@ -1,6 +1,10 @@
 #include "stdafx.h"
 #include "XUI_TextEntry.h"
+<<<<<<< HEAD
 #include <MultiPlayerLocalPlayer.h>
+=======
+#include "..\..\MultiplayerLocalPlayer.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 
 CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]=
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Common/XUI/XUI_TextEntry.h
index 6e644f5e4..70dcf30b2 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.h
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Media/xuiscene_text_entry.h>
+#include "..\Media\xuiscene_text_entry.h"
 #include "XUI_Ctrl_4JEdit.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
index 04596bb14..5a2e67b42 100644
--- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
@@ -6,7 +6,7 @@
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
-#include <ProgressRenderer.h>
+#include "..\..\ProgressRenderer.h"
 #include "XUI_TransferToXboxOne.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
index 8280e7651..f08de59ae 100644
--- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
+++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
@@ -2,7 +2,7 @@
 using namespace std;
 //#include <vector>
 
-#include <Media/xuiscene_TransferToXboxOne.h>
+#include "..\Media\xuiscene_TransferToXboxOne.h"
 
 
 class CXuiCtrl4JList;
diff --git a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h
index 19bc5ecd0..748b36a2b 100644
--- a/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h
+++ b/Minecraft.Client/Common/XUI/XUI_TrialExitUpsell.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <media/xuiscene_trialexitupsell.h>
+#include "../media/xuiscene_trialexitupsell.h"
 
 #define TRIAL_EXIT_UPSELL_IMAGE_DISPLAY_TIME 3000
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
index 2f340a846..f7725779e 100644
--- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
@@ -1,9 +1,17 @@
 #include "stdafx.h"
+<<<<<<< HEAD
 #include <Common/Tutorial/Tutorial.h>
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/StringHelpers.h>
 #include <Minecraft.World/Tile.h>
 #include <Minecraft.World/Item.h>
+=======
+#include "..\..\Common\Tutorial\Tutorial.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\Minecraft.World\Item.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_XZP_Icons.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h
index aaeab211a..657167594 100644
--- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h
+++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <media/xuiscene_tutorialpopup.h>
+#include "../media/xuiscene_tutorialpopup.h"
 #include "XUI_CustomMessages.h"
 
 class Tutorial;
diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp
index d64e7653b..61b818a07 100644
--- a/Minecraft.Client/Common/XUI/XUI_debug.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_debug.cpp
@@ -5,7 +5,7 @@
 
 #include <assert.h>
 #include "XUI_Debug.h"
-#include <Minecraft.Client/StatsCounter.h>
+#include "..\..\..\Minecraft.Client\StatsCounter.h"
 
 LPCWSTR CScene_Debug::m_DebugCheckboxTextA[eDebugSetting_Max+1]=
 {
diff --git a/Minecraft.Client/Common/zlib/crc32.c b/Minecraft.Client/Common/zlib/crc32.c
index b59d5bd53..979a7190a 100644
--- a/Minecraft.Client/Common/zlib/crc32.c
+++ b/Minecraft.Client/Common/zlib/crc32.c
@@ -28,7 +28,7 @@
 #  endif /* !DYNAMIC_CRC_TABLE */
 #endif /* MAKECRCH */
 
-#include <zutil.h>      /* for STDC and FAR definitions */
+#include "zutil.h"      /* for STDC and FAR definitions */
 
 #define local static
 
diff --git a/Minecraft.Client/CompassTexture.cpp b/Minecraft.Client/CompassTexture.cpp
index d741602bf..bba43b783 100644
--- a/Minecraft.Client/CompassTexture.cpp
+++ b/Minecraft.Client/CompassTexture.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Minecraft.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\JavaMath.h"
 #include "Texture.h"
 #include "CompassTexture.h"
 
diff --git a/Minecraft.Client/ConfirmScreen.cpp b/Minecraft.Client/ConfirmScreen.cpp
index cad3f4cc5..b67ea19d8 100644
--- a/Minecraft.Client/ConfirmScreen.cpp
+++ b/Minecraft.Client/ConfirmScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ConfirmScreen.h"
 #include "SmallButton.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 ConfirmScreen::ConfirmScreen(Screen *parent, const wstring& title1, const wstring& title2, int id)
 {
diff --git a/Minecraft.Client/ConnectScreen.cpp b/Minecraft.Client/ConnectScreen.cpp
index aff12e0f0..2cf005b6d 100644
--- a/Minecraft.Client/ConnectScreen.cpp
+++ b/Minecraft.Client/ConnectScreen.cpp
@@ -5,7 +5,7 @@
 #include "Button.h"
 #include "Minecraft.h"
 #include "User.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 
 ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port)
diff --git a/Minecraft.Client/ContainerScreen.cpp b/Minecraft.Client/ContainerScreen.cpp
index bbe1ba450..17b454063 100644
--- a/Minecraft.Client/ContainerScreen.cpp
+++ b/Minecraft.Client/ContainerScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ContainerScreen.h"
 #include "Textures.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
 
 ContainerScreen::ContainerScreen(shared_ptr<Container> inventory, shared_ptr<Container> container) : AbstractContainerScreen(new ContainerMenu(inventory, container))
 {
diff --git a/Minecraft.Client/ControlsScreen.cpp b/Minecraft.Client/ControlsScreen.cpp
index 51d5dd59f..487dbb160 100644
--- a/Minecraft.Client/ControlsScreen.cpp
+++ b/Minecraft.Client/ControlsScreen.cpp
@@ -2,7 +2,7 @@
 #include "ControlsScreen.h"
 #include "Options.h"
 #include "SmallButton.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 ControlsScreen::ControlsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/CraftingScreen.cpp b/Minecraft.Client/CraftingScreen.cpp
index 1dae770a0..c28df18df 100644
--- a/Minecraft.Client/CraftingScreen.cpp
+++ b/Minecraft.Client/CraftingScreen.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "CraftingScreen.h"
 #include "Textures.h"
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
 
 CraftingScreen::CraftingScreen(shared_ptr<Inventory> inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z))
 {
diff --git a/Minecraft.Client/CreateWorldScreen.cpp b/Minecraft.Client/CreateWorldScreen.cpp
index d3d8074d8..b9856c7e3 100644
--- a/Minecraft.Client/CreateWorldScreen.cpp
+++ b/Minecraft.Client/CreateWorldScreen.cpp
@@ -3,12 +3,12 @@
 #include "EditBox.h"
 #include "Button.h"
 #include "SurvivalMode.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\Random.h"
 
 CreateWorldScreen::CreateWorldScreen(Screen *lastScreen)
 {
diff --git a/Minecraft.Client/CreativeMode.cpp b/Minecraft.Client/CreativeMode.cpp
index ddf2238eb..48342ebc1 100644
--- a/Minecraft.Client/CreativeMode.cpp
+++ b/Minecraft.Client/CreativeMode.cpp
@@ -2,11 +2,11 @@
 #include "CreativeMode.h"
 #include "User.h"
 #include "LocalPlayer.h"
-#include <Minecraft.World//net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 CreativeMode::CreativeMode(Minecraft *minecraft) : GameMode(minecraft)
 {
diff --git a/Minecraft.Client/CreeperModel.cpp b/Minecraft.Client/CreeperModel.cpp
index 34326b0ee..dd9ef193f 100644
--- a/Minecraft.Client/CreeperModel.cpp
+++ b/Minecraft.Client/CreeperModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "CreeperModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/CreeperRenderer.cpp b/Minecraft.Client/CreeperRenderer.cpp
index 0789c53b9..a9d16314f 100644
--- a/Minecraft.Client/CreeperRenderer.cpp
+++ b/Minecraft.Client/CreeperRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "CreeperRenderer.h"
 #include "CreeperModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER);
 ResourceLocation CreeperRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_CREEPER);
diff --git a/Minecraft.Client/CritParticle.cpp b/Minecraft.Client/CritParticle.cpp
index 09853e27c..6c71b027f 100644
--- a/Minecraft.Client/CritParticle.cpp
+++ b/Minecraft.Client/CritParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "CritParticle.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 
 void CritParticle::_init(Level *level, shared_ptr<Entity> entity, ePARTICLE_TYPE type)
 {
diff --git a/Minecraft.Client/CritParticle2.cpp b/Minecraft.Client/CritParticle2.cpp
index f341084d8..363e8f08d 100644
--- a/Minecraft.Client/CritParticle2.cpp
+++ b/Minecraft.Client/CritParticle2.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CritParticle2.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 
 void CritParticle2::_init(double xa, double ya, double za, float scale)
 {
diff --git a/Minecraft.Client/Cube.h b/Minecraft.Client/Cube.h
index 41e9afa98..3aee2b650 100644
--- a/Minecraft.Client/Cube.h
+++ b/Minecraft.Client/Cube.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "Vertex.h"
 #include "Polygon.h"
 
diff --git a/Minecraft.Client/Culler.h b/Minecraft.Client/Culler.h
index 439f7ccf4..bd428ac0e 100644
--- a/Minecraft.Client/Culler.h
+++ b/Minecraft.Client/Culler.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/AABB.h>
+#include "..\Minecraft.World\AABB.h"
 
 class Culler
 {
diff --git a/Minecraft.Client/DLCTexturePack.cpp b/Minecraft.Client/DLCTexturePack.cpp
index 74dfdd2cf..553128d96 100644
--- a/Minecraft.Client/DLCTexturePack.cpp
+++ b/Minecraft.Client/DLCTexturePack.cpp
@@ -1,19 +1,19 @@
 #include "stdafx.h"
-#include <Common/DLC/DLCGameRulesFile.h>
-#include <Common/DLC/DLCGameRulesHeader.h>
-#include <Common/DLC/DLCGameRules.h>
+#include "Common\DLC\DLCGameRulesFile.h"
+#include "Common\DLC\DLCGameRulesHeader.h"
+#include "Common\DLC\DLCGameRules.h"
 #include "DLCTexturePack.h"
-#include <Common/DLC/DLCColourTableFile.h>
-#include <Common/DLC/DLCUIDataFile.h>
-#include <Common/DLC/DLCTextureFile.h>
-#include <Common/DLC/DLCLocalisationFile.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "Common\DLC\DLCColourTableFile.h"
+#include "Common\DLC\DLCUIDataFile.h"
+#include "Common\DLC\DLCTextureFile.h"
+#include "Common\DLC\DLCLocalisationFile.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #include "StringTable.h"
-#include <Common/DLC/DLCAudioFile.h>
+#include "Common\DLC\DLCAudioFile.h"
 
 #if defined _XBOX || defined _WINDOWS64
-#include <Xbox/XML/ATGXmlParser.h>
-#include <Xbox/XML/xmlFilesCallback.h>
+#include "Xbox\XML\ATGXmlParser.h"
+#include "Xbox\XML\xmlFilesCallback.h"
 #endif
 
 DLCTexturePack::DLCTexturePack(DWORD id, DLCPack *pack, TexturePack *fallback) : AbstractTexturePack(id, NULL, pack->getName(), fallback)
diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp
index 7ab6fe653..f63a053fe 100644
--- a/Minecraft.Client/DeathScreen.cpp
+++ b/Minecraft.Client/DeathScreen.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "DeathScreen.h"
 #include "Button.h"
 #include "MultiPlayerLocalPlayer.h"
diff --git a/Minecraft.Client/DefaultRenderer.cpp b/Minecraft.Client/DefaultRenderer.cpp
index 3eae5ebf5..d4c157377 100644
--- a/Minecraft.Client/DefaultRenderer.cpp
+++ b/Minecraft.Client/DefaultRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DefaultRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
 
 void DefaultRenderer::render(shared_ptr<Entity> entity, double x, double y, double z, float rot, float a)
 {
diff --git a/Minecraft.Client/DefaultTexturePack.cpp b/Minecraft.Client/DefaultTexturePack.cpp
index eec8a624f..d2974b6d0 100644
--- a/Minecraft.Client/DefaultTexturePack.cpp
+++ b/Minecraft.Client/DefaultTexturePack.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DefaultTexturePack.h"
 #include "Textures.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 
 DefaultTexturePack::DefaultTexturePack() : AbstractTexturePack(0, NULL, L"Minecraft", NULL)
diff --git a/Minecraft.Client/DemoLevel.cpp b/Minecraft.Client/DemoLevel.cpp
index a3cf5525a..91d233971 100644
--- a/Minecraft.Client/DemoLevel.cpp
+++ b/Minecraft.Client/DemoLevel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DemoLevel.h"
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
 
 DemoLevel::DemoLevel(shared_ptr<LevelStorage> levelStorage, const wstring& levelName) : Level(levelStorage, levelName, DEMO_LEVEL_SEED)
 {
diff --git a/Minecraft.Client/DemoLevel.h b/Minecraft.Client/DemoLevel.h
index 0b8cf1bc4..8364d5b49 100644
--- a/Minecraft.Client/DemoLevel.h
+++ b/Minecraft.Client/DemoLevel.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 
 class DemoLevel : public Level
 {
diff --git a/Minecraft.Client/DemoMode.cpp b/Minecraft.Client/DemoMode.cpp
index 30a58e5f0..3b24af7aa 100644
--- a/Minecraft.Client/DemoMode.cpp
+++ b/Minecraft.Client/DemoMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DemoMode.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 
 DemoMode::DemoMode(Minecraft *minecraft) : SurvivalMode(minecraft)
 {
diff --git a/Minecraft.Client/DerivedServerLevel.cpp b/Minecraft.Client/DerivedServerLevel.cpp
index 791857ee2..a67408d70 100644
--- a/Minecraft.Client/DerivedServerLevel.cpp
+++ b/Minecraft.Client/DerivedServerLevel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DerivedServerLevel.h"
-#include <Minecraft.World/SavedDataStorage.h>
-#include <Minecraft.World/DerivedLevelData.h>
+#include "..\Minecraft.World\SavedDataStorage.h"
+#include "..\Minecraft.World\DerivedLevelData.h"
 
 DerivedServerLevel::DerivedServerLevel(MinecraftServer *server, shared_ptr<LevelStorage> levelStorage, const wstring& levelName, int dimension, LevelSettings *levelSettings, ServerLevel *wrapped)
 	: ServerLevel(server, levelStorage, levelName, dimension, levelSettings)
diff --git a/Minecraft.Client/DirtyChunkSorter.cpp b/Minecraft.Client/DirtyChunkSorter.cpp
index 4f5b3967f..ebeed96d0 100644
--- a/Minecraft.Client/DirtyChunkSorter.cpp
+++ b/Minecraft.Client/DirtyChunkSorter.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DirtyChunkSorter.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "Chunk.h"
 
 DirtyChunkSorter::DirtyChunkSorter(shared_ptr<LivingEntity> cameraEntity, int playerIndex)	// 4J - added player index
diff --git a/Minecraft.Client/DisconnectedScreen.cpp b/Minecraft.Client/DisconnectedScreen.cpp
index efec84daf..b445e4d07 100644
--- a/Minecraft.Client/DisconnectedScreen.cpp
+++ b/Minecraft.Client/DisconnectedScreen.cpp
@@ -2,7 +2,7 @@
 #include "DisconnectedScreen.h"
 #include "TitleScreen.h"
 #include "Button.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 DisconnectedScreen::DisconnectedScreen(const wstring& title, const wstring reason, void *reasonObjects, ...)
 {
diff --git a/Minecraft.Client/DispenserBootstrap.h b/Minecraft.Client/DispenserBootstrap.h
index 169ada54c..84dde91ad 100644
--- a/Minecraft.Client/DispenserBootstrap.h
+++ b/Minecraft.Client/DispenserBootstrap.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/DispenserTile.h>
-#include <Minecraft.World/net.minecraft.core.h>
-#include <Minecraft.World/LevelEvent.h>
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/DispenserTile.h"
+#include "../Minecraft.World/net.minecraft.core.h"
+#include "../Minecraft.World/LevelEvent.h"
 
 class DispenserBootstrap
 {
diff --git a/Minecraft.Client/DistanceChunkSorter.cpp b/Minecraft.Client/DistanceChunkSorter.cpp
index bc6882aa7..80ac0cdf5 100644
--- a/Minecraft.Client/DistanceChunkSorter.cpp
+++ b/Minecraft.Client/DistanceChunkSorter.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DistanceChunkSorter.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "Chunk.h"
 
 DistanceChunkSorter::DistanceChunkSorter(shared_ptr<Entity> player)
diff --git a/Minecraft.Client/DragonBreathParticle.cpp b/Minecraft.Client/DragonBreathParticle.cpp
index 89bd151c3..0d0f75f33 100644
--- a/Minecraft.Client/DragonBreathParticle.cpp
+++ b/Minecraft.Client/DragonBreathParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "DragonBreathParticle.h"
 
 void DragonBreathParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/DragonModel.cpp b/Minecraft.Client/DragonModel.cpp
index 6d3a68607..9e0499a9f 100644
--- a/Minecraft.Client/DragonModel.cpp
+++ b/Minecraft.Client/DragonModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DragonModel.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/EnderDragon.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\Enderdragon.h"
 
 DragonModel::DragonModel(float g) : Model()
 {
diff --git a/Minecraft.Client/DripParticle.cpp b/Minecraft.Client/DripParticle.cpp
index 1092bdc91..9463976e6 100644
--- a/Minecraft.Client/DripParticle.cpp
+++ b/Minecraft.Client/DripParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Mth.h"
 #include "DripParticle.h"
 
 DripParticle::DripParticle(Level *level, double x, double y, double z, Material *material) : Particle(level, x, y, z, 0, 0, 0)
diff --git a/Minecraft.Client/Durango/Durango_App.cpp b/Minecraft.Client/Durango/Durango_App.cpp
index 008a7405a..2ec81a29c 100644
--- a/Minecraft.Client/Durango/Durango_App.cpp
+++ b/Minecraft.Client/Durango/Durango_App.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-#include <Common/Consoles_App.h>
-#include <User.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/LevelType.h>
-#include <ServiceConfig/Events-XBLA.8-149E11AEEvents.h>
-#include <Minecraft.World/DurangoStats.h>
-#include <Minecraft.Client/Durango/XML/xmlFilesCallback.h>
+#include "..\Common\Consoles_App.h"
+#include "..\User.h"
+#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\Minecraft.Client\MinecraftServer.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\Minecraft.World\LevelType.h"
+#include "ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
+#include "..\..\Minecraft.World\DurangoStats.h"
+#include "..\..\Minecraft.Client\Durango\XML\xmlFilesCallback.h"
 
 CConsoleMinecraftApp app;
 
diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp
index cc78e3bdc..48d5c3198 100644
--- a/Minecraft.Client/Durango/Durango_Minecraft.cpp
+++ b/Minecraft.Client/Durango/Durango_Minecraft.cpp
@@ -4,35 +4,35 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
-#include <Leaderboards/GameProgress.h>
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-#include <Leaderboards/DurangoLeaderboardManager.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
+#include "Leaderboards\GameProgress.h"
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+#include "Leaderboards\DurangoLeaderboardManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
 #include "Resource.h"
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
 #include <agile.h>
 
 //using namespace Windows::Xbox::Input;
diff --git a/Minecraft.Client/Durango/Durango_UIController.h b/Minecraft.Client/Durango/Durango_UIController.h
index 59e5164d1..28fe08adb 100644
--- a/Minecraft.Client/Durango/Durango_UIController.h
+++ b/Minecraft.Client/Durango/Durango_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIController.h>
+#include "..\Common\UI\UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/Durango/Iggy/gdraw/gdraw_d3d11.cpp b/Minecraft.Client/Durango/Iggy/gdraw/gdraw_d3d11.cpp
index 27e9e9834..0c106b3fd 100644
--- a/Minecraft.Client/Durango/Iggy/gdraw/gdraw_d3d11.cpp
+++ b/Minecraft.Client/Durango/Iggy/gdraw/gdraw_d3d11.cpp
@@ -1,4 +1,4 @@
-#include <stdafx.h> // 4J
+#include "stdafx.h" // 4J
 
 // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools
 //
diff --git a/Minecraft.Client/Durango/Iggy/include/iggy.h b/Minecraft.Client/Durango/Iggy/include/iggy.h
index b160d53c7..56638a321 100644
--- a/Minecraft.Client/Durango/Iggy/include/iggy.h
+++ b/Minecraft.Client/Durango/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include <rrcore.h>   // base data types, macros
+#include "rrcore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
index 4276d44c9..cbedb0330 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DurangoLeaderboardManager.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 namespace WFC = Windows::Foundation::Collections;
 namespace CC = concurrency;
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
index 7a9e2b476..233d8b711 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 namespace P = Platform;
 namespace PC = Platform::Collections;
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
index 8163c3607..caa5857e9 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/Item.h>
+#include "..\Minecraft.World\Tile.h"
+#include "..\Minecraft.World\Item.h"
 
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 
-#include <Minecraft.World/EntityIO.h>
+#include "..\Minecraft.World\EntityIO.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
-#include <Common/Console_Awards_enum.h>
+#include "Common\Console_Awards_enum.h"
 
 #include "DurangoStatsDebugger.h"
 
diff --git a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
index 00cf63bc4..dd07f3e96 100644
--- a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
-#include <Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h>
+#include "Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
 
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 
 #include "GameProgress.h"
 
diff --git a/Minecraft.Client/Durango/Network/ChatIntegrationLayer.h b/Minecraft.Client/Durango/Network/ChatIntegrationLayer.h
index b918a7cee..80b4e10a3 100644
--- a/Minecraft.Client/Durango/Network/ChatIntegrationLayer.h
+++ b/Minecraft.Client/Durango/Network/ChatIntegrationLayer.h
@@ -6,7 +6,7 @@
 //// Copyright (c) Microsoft Corporation. All rights reserved
 #pragma once
 
-//#include <UserController.h>
+//#include "UserController.h"
 
 class DQRNetworkManager;
 
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
index bd1a9900e..f13cc4aac 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Durango/Network/DQRNetworkManager.h
index 8df628476..5f7b8d908 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager.h
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DQRNetworkPlayer.h"
-#include <Minecraft.World/C4JThread.h>
+#include "..\Minecraft.World\C4JThread.h"
 #include <collection.h>
 
 class IDQRNetworkManagerListener;
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
index fa3f61697..3a14a2d59 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
index aed1191aa..cf66ea6f6 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
index e73ef1fc1..9232d0959 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
index 2264dbb7b..c985a191f 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include <Minecraft.World/DurangoStats.h>
+#include "..\Minecraft.World\DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
index 65bc7a1d0..c95e8aefc 100644
--- a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
+++ b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/NetworkPlayerInterface.h>
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
 #include "DQRNetworkPlayer.h"
 
 // This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way.
diff --git a/Minecraft.Client/Durango/Network/PartyController.cpp b/Minecraft.Client/Durango/Network/PartyController.cpp
index 88b78b4aa..753a71aca 100644
--- a/Minecraft.Client/Durango/Network/PartyController.cpp
+++ b/Minecraft.Client/Durango/Network/PartyController.cpp
@@ -11,9 +11,9 @@
 
 /*
 #include "time.h"
-#include <GameLogic/Game.h>
-#include <Utils/LogController.h>
-#include <Utils/Utils.h>
+#include "../GameLogic/Game.h"
+#include "../Utils/LogController.h"
+#include "../Utils/Utils.h"
 #include "UserController.h"
 #include "SessionController.h"
 */
diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
index 0ec614064..3efba5edb 100644
--- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
+++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"	
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerDurango.h"
 #include "NetworkPlayerDurango.h"
 
diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
index eb891473f..558072275 100644
--- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
+++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <Minecraft.World/C4JThread.h>
-#include <Common/Network/NetworkPlayerInterface.h>
-#include <Common/Network/PlatformNetworkManagerInterface.h>
-#include <Common/Network/SessionInfo.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
+#include "..\..\Common\Network\SessionInfo.h"
 #include "DQRNetworkManager.h"
 
 #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000
diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
index b503255c0..d51ce9666 100644
--- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
+++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/LevelSettings.h>
+#include "..\Minecraft.World\Player.h"
+#include "..\Minecraft.World\Level.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\LevelSettings.h"
 
-#include <Common/Network/GameNetworkManager.h>
+#include "Common\Network\GameNetworkManager.h"
 #include "MultiPlayerLocalPlayer.h"
 
-#include <ServiceConfig/Events-XBLA.8-149E11AEEvents.h>
+#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
 
 #include "DurangoTelemetry.h"
 
diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
index c57ffd312..4f0866963 100644
--- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
+++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Minecraft.World/DurangoStats.h>
+#include "..\..\..\Minecraft.World\DurangoStats.h"
 
-#include <Common/Telemetry/TelemetryManager.h>
+#include "..\..\Common\Telemetry\TelemetryManager.h"
 
 class CDurangoTelemetryManager : public CTelemetryManager
 {
diff --git a/Minecraft.Client/Durango/XboxGameMode.cpp b/Minecraft.Client/Durango/XboxGameMode.cpp
index 3ebc5216f..1b55fdd9f 100644
--- a/Minecraft.Client/Durango/XboxGameMode.cpp
+++ b/Minecraft.Client/Durango/XboxGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XboxGameMode.h"
-#include <Common/Tutorial/Tutorial.h>
+#include "..\Common\Tutorial\Tutorial.h"
 
 XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Durango/XboxGameMode.h b/Minecraft.Client/Durango/XboxGameMode.h
index 9c8fd1305..347cdf308 100644
--- a/Minecraft.Client/Durango/XboxGameMode.h
+++ b/Minecraft.Client/Durango/XboxGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Common/Tutorial/TutorialMode.h>
+#include "..\Common\Tutorial\TutorialMode.h"
 
 class XboxGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EchantmentTableParticle.cpp
index 3bdcae077..5af7ef365 100644
--- a/Minecraft.Client/EchantmentTableParticle.cpp
+++ b/Minecraft.Client/EchantmentTableParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "EchantmentTableParticle.h"
 
 EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
diff --git a/Minecraft.Client/EditBox.cpp b/Minecraft.Client/EditBox.cpp
index fa7d6f393..54ee62ef3 100644
--- a/Minecraft.Client/EditBox.cpp
+++ b/Minecraft.Client/EditBox.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "EditBox.h"
-#include <Minecraft.World/SharedConstants.h>
+#include "..\Minecraft.World\SharedConstants.h"
 
 EditBox::EditBox(Screen *screen, Font *font, int x, int y, int width, int height, const wstring& value)
 {
diff --git a/Minecraft.Client/EnchantTableRenderer.cpp b/Minecraft.Client/EnchantTableRenderer.cpp
index aa38be361..ff539fcd5 100644
--- a/Minecraft.Client/EnchantTableRenderer.cpp
+++ b/Minecraft.Client/EnchantTableRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "BookModel.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\Mth.h"
 #include "EnchantTableRenderer.h"
 
 ResourceLocation EnchantTableRenderer::BOOK_LOCATION = ResourceLocation(TN_ITEM_BOOK);
diff --git a/Minecraft.Client/EnderChestRenderer.cpp b/Minecraft.Client/EnderChestRenderer.cpp
index 3a23444c1..52fdede94 100644
--- a/Minecraft.Client/EnderChestRenderer.cpp
+++ b/Minecraft.Client/EnderChestRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "ModelPart.h"
 #include "EnderChestRenderer.h"
 
diff --git a/Minecraft.Client/EnderCrystalRenderer.cpp b/Minecraft.Client/EnderCrystalRenderer.cpp
index 209295590..d2eba5e83 100644
--- a/Minecraft.Client/EnderCrystalRenderer.cpp
+++ b/Minecraft.Client/EnderCrystalRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "EnderCrystalModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
 #include "EnderCrystalRenderer.h"
 
 ResourceLocation EnderCrystalRenderer::ENDER_CRYSTAL_LOCATION = ResourceLocation(TN_MOB_ENDERDRAGON_ENDERCRYSTAL);
diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp
index 3298c970c..037552ed3 100644
--- a/Minecraft.Client/EnderDragonRenderer.cpp
+++ b/Minecraft.Client/EnderDragonRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DragonModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
 #include "Tesselator.h"
 #include "Lighting.h"
 #include "EnderDragonRenderer.h"
diff --git a/Minecraft.Client/EnderParticle.cpp b/Minecraft.Client/EnderParticle.cpp
index c76b9a532..3889bf920 100644
--- a/Minecraft.Client/EnderParticle.cpp
+++ b/Minecraft.Client/EnderParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "EnderParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Random.h"
 
 // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle
 // End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use this particle
diff --git a/Minecraft.Client/EndermanRenderer.cpp b/Minecraft.Client/EndermanRenderer.cpp
index 4edfe4d89..f6e5220a4 100644
--- a/Minecraft.Client/EndermanRenderer.cpp
+++ b/Minecraft.Client/EndermanRenderer.cpp
@@ -2,8 +2,8 @@
 #include "EndermanRenderer.h"
 #include "EndermanModel.h"
 #include "TextureAtlas.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 ResourceLocation EndermanRenderer::ENDERMAN_EYES_LOCATION = ResourceLocation(TN_MOB_ENDERMAN_EYES);
 ResourceLocation EndermanRenderer::ENDERMAN_LOCATION = ResourceLocation(TN_MOB_ENDERMAN);
diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp
index 00b0c4eeb..07b1e90bb 100644
--- a/Minecraft.Client/EntityRenderDispatcher.cpp
+++ b/Minecraft.Client/EntityRenderDispatcher.cpp
@@ -1,18 +1,18 @@
 #include "stdafx.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <Minecraft.World/net.minecraft.world.entity.npc.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
 #include "SpiderRenderer.h"
 #include "PigRenderer.h"
 #include "SheepRenderer.h"
diff --git a/Minecraft.Client/EntityRenderDispatcher.h b/Minecraft.Client/EntityRenderDispatcher.h
index 0c946d7a8..07ab7c4d0 100644
--- a/Minecraft.Client/EntityRenderDispatcher.h
+++ b/Minecraft.Client/EntityRenderDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EntityRenderer.h"
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\Entity.h"
+#include "..\Minecraft.World\JavaIntHash.h"
 class font;
 using namespace std;
 
diff --git a/Minecraft.Client/EntityRenderer.cpp b/Minecraft.Client/EntityRenderer.cpp
index 7d97bc276..9aa4ad7d9 100644
--- a/Minecraft.Client/EntityRenderer.cpp
+++ b/Minecraft.Client/EntityRenderer.cpp
@@ -5,13 +5,13 @@
 #include "LocalPlayer.h"
 #include "Options.h"
 #include "TextureAtlas.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\Level.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation EntityRenderer::SHADOW_LOCATION = ResourceLocation(TN__CLAMP__MISC_SHADOW);
 
diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp
index e8f2f58aa..deed369e8 100644
--- a/Minecraft.Client/EntityTileRenderer.cpp
+++ b/Minecraft.Client/EntityTileRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "EntityTileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 
 EntityTileRenderer *EntityTileRenderer::instance = new EntityTileRenderer;
 
diff --git a/Minecraft.Client/EntityTracker.cpp b/Minecraft.Client/EntityTracker.cpp
index 97848a1d0..adc230eea 100644
--- a/Minecraft.Client/EntityTracker.cpp
+++ b/Minecraft.Client/EntityTracker.cpp
@@ -5,20 +5,20 @@
 #include "TrackedEntity.h"
 #include "ServerPlayer.h"
 #include "ServerLevel.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/BasicTypeContainers.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\BasicTypeContainers.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
 #include "PlayerConnection.h"
 
 EntityTracker::EntityTracker(ServerLevel *level)
diff --git a/Minecraft.Client/EntityTracker.h b/Minecraft.Client/EntityTracker.h
index 2ddcc6162..6ff9fe0f7 100644
--- a/Minecraft.Client/EntityTracker.h
+++ b/Minecraft.Client/EntityTracker.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/HashExtension.h>
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\HashExtension.h"
+#include "..\Minecraft.World\JavaIntHash.h"
 class Entity;
 class ServerPlayer;
 class TrackedEntity;
diff --git a/Minecraft.Client/ExperienceOrbRenderer.cpp b/Minecraft.Client/ExperienceOrbRenderer.cpp
index d20e7bd86..c0eae7560 100644
--- a/Minecraft.Client/ExperienceOrbRenderer.cpp
+++ b/Minecraft.Client/ExperienceOrbRenderer.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "ExperienceOrbRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "Tesselator.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB);
 
diff --git a/Minecraft.Client/ExplodeParticle.cpp b/Minecraft.Client/ExplodeParticle.cpp
index 1ba39c139..fa950a03a 100644
--- a/Minecraft.Client/ExplodeParticle.cpp
+++ b/Minecraft.Client/ExplodeParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ExplodeParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Random.h"
 
 ExplodeParticle::ExplodeParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 139f1ec51..23b2c7f0e 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -4,34 +4,34 @@
 #endif // __PS3__
 
 #ifdef __PS3__
-#include <PS3/Sentient/SentientManager.h>
+#include "PS3\Sentient\SentientManager.h"
 #include "StatsCounter.h"
-#include <PS3/Social/SocialManager.h>
+#include "PS3\Social\SocialManager.h"
 #include <libsn.h>
 #include <libsntuner.h>
 #elif defined _DURANGO
-#include <Durango/Sentient/SentientManager.h>
+#include "Durango\Sentient\SentientManager.h"
 #include "StatsCounter.h"
-#include <Durango/Social/SocialManager.h>
-#include <Durango/Sentient/DynamicConfigurations.h>
-#include <Durango/DurangoExtras/xcompress.h>
+#include "Durango\Social\SocialManager.h"
+#include "Durango\Sentient\DynamicConfigurations.h"
+#include "Durango\DurangoExtras\xcompress.h"
 #elif defined _WINDOWS64
-#include <Windows64/Sentient/SentientManager.h>
+#include "Windows64\Sentient\SentientManager.h"
 #include "StatsCounter.h"
-#include <Windows64/Social/SocialManager.h>
-#include <Windows64/Sentient/DynamicConfigurations.h>
-#include <Windows64/Network/WinsockNetLayer.h>
+#include "Windows64\Social\SocialManager.h"
+#include "Windows64\Sentient\DynamicConfigurations.h"
+#include "Windows64\Network\WinsockNetLayer.h"
 #elif defined __PSVITA__
-#include <PSVita/Sentient/SentientManager.h>
+#include "PSVita\Sentient\SentientManager.h"
 #include "StatsCounter.h"
-#include <PSVita/Social/SocialManager.h>
-#include <PSVita/Sentient/DynamicConfigurations.h>
+#include "PSVita\Social\SocialManager.h"
+#include "PSVita\Sentient\DynamicConfigurations.h"
 #include <libperf.h>
 #else
-#include <Orbis/Sentient/SentientManager.h>
+#include "Orbis\Sentient\SentientManager.h"
 #include "StatsCounter.h"
-#include <Orbis/Social/SocialManager.h>
-#include <Orbis/Sentient/DynamicConfigurations.h>
+#include "Orbis\Social\SocialManager.h"
+#include "Orbis\Sentient\DynamicConfigurations.h"
 #include <perf.h>
 #endif
 
diff --git a/Minecraft.Client/FallingTileRenderer.cpp b/Minecraft.Client/FallingTileRenderer.cpp
index d1a46799e..2d9f5daea 100644
--- a/Minecraft.Client/FallingTileRenderer.cpp
+++ b/Minecraft.Client/FallingTileRenderer.cpp
@@ -2,9 +2,9 @@
 #include "FallingTileRenderer.h"
 #include "TextureAtlas.h"
 #include "TileRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 #include "EntityRenderDispatcher.h"
 
 FallingTileRenderer::FallingTileRenderer() : EntityRenderer()
diff --git a/Minecraft.Client/FireballRenderer.cpp b/Minecraft.Client/FireballRenderer.cpp
index f2a703db9..3b1ab924f 100644
--- a/Minecraft.Client/FireballRenderer.cpp
+++ b/Minecraft.Client/FireballRenderer.cpp
@@ -2,11 +2,11 @@
 #include "FireballRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "TextureAtlas.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 FireballRenderer::FireballRenderer(float scale)
 {
diff --git a/Minecraft.Client/FireworksParticles.cpp b/Minecraft.Client/FireworksParticles.cpp
index e85364eae..fd19b0114 100644
--- a/Minecraft.Client/FireworksParticles.cpp
+++ b/Minecraft.Client/FireworksParticles.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "FireworksParticles.h"
 #include "Tesselator.h"
-#include <Minecraft.World/Level.h>
+#include "../Minecraft.World/Level.h"
 
 FireworksParticles::FireworksStarter::FireworksStarter(Level *level, double x, double y, double z, double xd, double yd, double zd, ParticleEngine *engine, CompoundTag *infoTag) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/FireworksParticles.h b/Minecraft.Client/FireworksParticles.h
index 8b837d2b6..ac06be073 100644
--- a/Minecraft.Client/FireworksParticles.h
+++ b/Minecraft.Client/FireworksParticles.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Particle.h"
-#include <Minecraft.World/CompoundTag.h>
+#include "..\Minecraft.World\CompoundTag.h"
 
 class ParticleEngine;
 
diff --git a/Minecraft.Client/FishingHookRenderer.cpp b/Minecraft.Client/FishingHookRenderer.cpp
index cd1b7ff8b..9d60a9ace 100644
--- a/Minecraft.Client/FishingHookRenderer.cpp
+++ b/Minecraft.Client/FishingHookRenderer.cpp
@@ -2,10 +2,10 @@
 #include "FishingHookRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "Options.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\Vec3.h"
+#include "..\Minecraft.World\Mth.h"
 #include "MultiPlayerLocalPlayer.h"
 
 ResourceLocation FishingHookRenderer::PARTICLE_LOCATION = ResourceLocation(TN_PARTICLES);
diff --git a/Minecraft.Client/FlameParticle.cpp b/Minecraft.Client/FlameParticle.cpp
index 5043190f4..eb12dbfda 100644
--- a/Minecraft.Client/FlameParticle.cpp
+++ b/Minecraft.Client/FlameParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Random.h"
 #include "FlameParticle.h"
 
 FlameParticle::FlameParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
diff --git a/Minecraft.Client/Font.cpp b/Minecraft.Client/Font.cpp
index f9c41ced8..7a37dd7b8 100644
--- a/Minecraft.Client/Font.cpp
+++ b/Minecraft.Client/Font.cpp
@@ -4,10 +4,10 @@
 #include "Options.h"
 #include "Tesselator.h"
 #include "ResourceLocation.h"
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\Random.h"
 
 Font::Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[]/* = nullptr */) : textures(textures)
 {
diff --git a/Minecraft.Client/FootstepParticle.cpp b/Minecraft.Client/FootstepParticle.cpp
index e74f04ead..300575eb1 100644
--- a/Minecraft.Client/FootstepParticle.cpp
+++ b/Minecraft.Client/FootstepParticle.cpp
@@ -2,8 +2,8 @@
 #include "FootstepParticle.h"
 #include "Textures.h"
 #include "Tesselator.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "ResourceLocation.h"
 
 ResourceLocation FootstepParticle::FOOTPRINT_LOCATION = ResourceLocation(TN_MISC_FOOTSTEP);
diff --git a/Minecraft.Client/Frustum.cpp b/Minecraft.Client/Frustum.cpp
index 7bd9cfd7f..c40f7c6fa 100644
--- a/Minecraft.Client/Frustum.cpp
+++ b/Minecraft.Client/Frustum.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/FloatBuffer.h>
+#include "..\Minecraft.World\FloatBuffer.h"
 #include "Frustum.h"
 
 Frustum *Frustum::frustum = new Frustum();
diff --git a/Minecraft.Client/FrustumData.h b/Minecraft.Client/FrustumData.h
index 7bcf94370..7285f145c 100644
--- a/Minecraft.Client/FrustumData.h
+++ b/Minecraft.Client/FrustumData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/AABB.h>
+#include "..\Minecraft.World\AABB.h"
 
 class FrustumData
 {
diff --git a/Minecraft.Client/FurnaceScreen.cpp b/Minecraft.Client/FurnaceScreen.cpp
index 47459564d..20ec71040 100644
--- a/Minecraft.Client/FurnaceScreen.cpp
+++ b/Minecraft.Client/FurnaceScreen.cpp
@@ -3,8 +3,8 @@
 #include "Textures.h"
 #include "LocalPlayer.h"
 #include "Font.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\FurnaceTileEntity.h"
 
 FurnaceScreen::FurnaceScreen(shared_ptr<Inventory> inventory, shared_ptr<FurnaceTileEntity> furnace) : AbstractContainerScreen(new FurnaceMenu(inventory, furnace))
 {
diff --git a/Minecraft.Client/GameMode.cpp b/Minecraft.Client/GameMode.cpp
index 4426dcd43..a11d6c07b 100644
--- a/Minecraft.Client/GameMode.cpp
+++ b/Minecraft.Client/GameMode.cpp
@@ -2,13 +2,13 @@
 #include "GameMode.h"
 #include "LocalPlayer.h"
 #include "LevelRenderer.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
 
 GameMode::GameMode(Minecraft *minecraft)
 {
diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp
index 0fcd1e7bb..68754f65d 100644
--- a/Minecraft.Client/GameRenderer.cpp
+++ b/Minecraft.Client/GameRenderer.cpp
@@ -17,35 +17,35 @@
 #include "GuiParticles.h"
 #include "MultiPlayerLevel.h"
 #include "Chunk.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.enchantment.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.biome.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.World/SparseLightStorage.h>
-#include <Minecraft.World/CompressedTileStorage.h>
-#include <Minecraft.World/SparseDataStorage.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Facing.h>
-#include <Minecraft.World/MobEffect.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/SmoothFloat.h>
-#include <Minecraft.World/MobEffectInstance.h>
-#include <Minecraft.World/Item.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.enchantment.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.biome.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\ThreadName.h"
+#include "..\Minecraft.World\SparseLightStorage.h"
+#include "..\Minecraft.World\CompressedTileStorage.h"
+#include "..\Minecraft.World\SparseDataStorage.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Facing.h"
+#include "..\Minecraft.World\MobEffect.h"
+#include "..\Minecraft.World\IntCache.h"
+#include "..\Minecraft.World\SmoothFloat.h"
+#include "..\Minecraft.World\MobEffectInstance.h"
+#include "..\Minecraft.World\Item.h"
 #include "Camera.h"
-#include <Minecraft.World/SoundTypes.h>
+#include "..\Minecraft.World\SoundTypes.h"
 #include "HumanoidModel.h"
-#include <Minecraft.World/Item.h>
-#include <Minecraft.World/compression.h>
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "..\Minecraft.World\Item.h"
+#include "..\Minecraft.World\compression.h"
+#include "PS3\PS3Extras\ShutdownManager.h"
 #include "BossMobGuiInfo.h"
 
 #include "TexturePackRepository.h"
diff --git a/Minecraft.Client/GameRenderer.h b/Minecraft.Client/GameRenderer.h
index 88eb212f1..1db7713a4 100644
--- a/Minecraft.Client/GameRenderer.h
+++ b/Minecraft.Client/GameRenderer.h
@@ -9,8 +9,8 @@ class SparseLightStorage;
 class CompressedTileStorage;
 class SparseDataStorage;
 
-#include <Minecraft.World/SmoothFloat.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\Minecraft.World\SmoothFloat.h"
+#include "..\Minecraft.World\C4JThread.h"
 #include "ResourceLocation.h"
 
 class GameRenderer
diff --git a/Minecraft.Client/GhastModel.cpp b/Minecraft.Client/GhastModel.cpp
index 6cdbac1e0..14277c438 100644
--- a/Minecraft.Client/GhastModel.cpp
+++ b/Minecraft.Client/GhastModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\Mth.h"
 #include "GhastModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/GhastRenderer.cpp b/Minecraft.Client/GhastRenderer.cpp
index 9850c6ff4..cecb4eaf5 100644
--- a/Minecraft.Client/GhastRenderer.cpp
+++ b/Minecraft.Client/GhastRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "GhastRenderer.h"
 #include "GhastModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 
 ResourceLocation GhastRenderer::GHAST_LOCATION = ResourceLocation(TN_MOB_GHAST);
 ResourceLocation GhastRenderer::GHAST_SHOOTING_LOCATION = ResourceLocation(TN_MOB_GHAST_FIRE);
diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp
index 4635ea2c6..54d57cf24 100644
--- a/Minecraft.Client/Gui.cpp
+++ b/Minecraft.Client/Gui.cpp
@@ -10,24 +10,24 @@
 #include "Lighting.h"
 #include "ChatScreen.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/Language.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\Language.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/Dimension.h>
-#include <Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h>
+#include "..\Minecraft.World\Dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
 #include "EnderDragonRenderer.h"
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/LevelChunk.h>
-#include <Minecraft.World/Biome.h>
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\LevelChunk.h"
+#include "..\Minecraft.World\Biome.h"
 
 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);
 
diff --git a/Minecraft.Client/GuiParticle.cpp b/Minecraft.Client/GuiParticle.cpp
index dae25c2b8..25859c707 100644
--- a/Minecraft.Client/GuiParticle.cpp
+++ b/Minecraft.Client/GuiParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "GuiParticle.h"
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\Random.h"
 
 Random *GuiParticle::random = new Random();
 
diff --git a/Minecraft.Client/HorseRenderer.cpp b/Minecraft.Client/HorseRenderer.cpp
index 81b9bf15b..006f9e200 100644
--- a/Minecraft.Client/HorseRenderer.cpp
+++ b/Minecraft.Client/HorseRenderer.cpp
@@ -2,7 +2,7 @@
 #include "HorseRenderer.h"
 #include "MobRenderer.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation HorseRenderer::HORSE_LOCATION = ResourceLocation(TN_MOB_HORSE_WHITE);
 ResourceLocation HorseRenderer::HORSE_MULE_LOCATION = ResourceLocation(TN_MOB_MULE);
diff --git a/Minecraft.Client/HugeExplosionParticle.cpp b/Minecraft.Client/HugeExplosionParticle.cpp
index 14b0eb089..2a104c19e 100644
--- a/Minecraft.Client/HugeExplosionParticle.cpp
+++ b/Minecraft.Client/HugeExplosionParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "HugeExplosionParticle.h"
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\Random.h"
 #include "Textures.h"
 #include "Tesselator.h"
 #include "Lighting.h"
diff --git a/Minecraft.Client/HugeExplosionSeedParticle.cpp b/Minecraft.Client/HugeExplosionSeedParticle.cpp
index dbbe9b589..7514cc44f 100644
--- a/Minecraft.Client/HugeExplosionSeedParticle.cpp
+++ b/Minecraft.Client/HugeExplosionSeedParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "HugeExplosionSeedParticle.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 
 HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0)
 {
diff --git a/Minecraft.Client/HumanoidMobRenderer.cpp b/Minecraft.Client/HumanoidMobRenderer.cpp
index d69924120..a9ff25c45 100644
--- a/Minecraft.Client/HumanoidMobRenderer.cpp
+++ b/Minecraft.Client/HumanoidMobRenderer.cpp
@@ -4,11 +4,11 @@
 #include "HumanoidModel.h"
 #include "ModelPart.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.h"
 
 const wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { L"cloth", L"chain", L"iron", L"diamond", L"gold" };
 std::map<wstring, ResourceLocation> HumanoidMobRenderer::ARMOR_LOCATION_CACHE;
diff --git a/Minecraft.Client/HumanoidModel.cpp b/Minecraft.Client/HumanoidModel.cpp
index 997633580..05d132fae 100644
--- a/Minecraft.Client/HumanoidModel.cpp
+++ b/Minecraft.Client/HumanoidModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "HumanoidModel.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/Entity.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\Entity.h"
 #include "ModelPart.h"
 
 // 4J added 
diff --git a/Minecraft.Client/InBedChatScreen.cpp b/Minecraft.Client/InBedChatScreen.cpp
index 40f8bf064..fca3d0228 100644
--- a/Minecraft.Client/InBedChatScreen.cpp
+++ b/Minecraft.Client/InBedChatScreen.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "InBedChatScreen.h"
 #include "Button.h"
-#include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "MultiplayerLocalPlayer.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 void InBedChatScreen::init()
 {
diff --git a/Minecraft.Client/Input.cpp b/Minecraft.Client/Input.cpp
index 7d42ace13..6933a2d70 100644
--- a/Minecraft.Client/Input.cpp
+++ b/Minecraft.Client/Input.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "Minecraft.h"
 #include "GameMode.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
 #include "Input.h"
-#include <Minecraft.Client/LocalPlayer.h>
+#include "..\Minecraft.Client\LocalPlayer.h"
 #include "Options.h"
 
 Input::Input()
diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp
index 344f3eee4..0c8701af4 100644
--- a/Minecraft.Client/InventoryScreen.cpp
+++ b/Minecraft.Client/InventoryScreen.cpp
@@ -8,7 +8,7 @@
 #include "Button.h"
 #include "AchievementScreen.h"
 #include "StatsScreen.h"
-#include <Minecraft.World/net.minecraft.stats.h>
+#include "..\Minecraft.World\net.minecraft.stats.h"
 
 InventoryScreen::InventoryScreen(shared_ptr<Player> player) : AbstractContainerScreen(player->inventoryMenu)
 {
diff --git a/Minecraft.Client/ItemFrameRenderer.cpp b/Minecraft.Client/ItemFrameRenderer.cpp
index 100881653..2d7493ecb 100644
--- a/Minecraft.Client/ItemFrameRenderer.cpp
+++ b/Minecraft.Client/ItemFrameRenderer.cpp
@@ -1,21 +1,21 @@
 #include "stdafx.h"
 #include "ItemRenderer.h"
-#include "TileRenderer.h"
-#include "EntityRenderDispatcher.h"
-//#include <ItemFrame>
+#include "tileRenderer.h"
+#include "entityRenderDispatcher.h"
+//#include "ItemFrame"
 #include "ItemFrameRenderer.h"
 #include "TextureAtlas.h"
 
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.Item.h"
+#include "..\Minecraft.World\net.minecraft.world.Item.h"
+#include "..\Minecraft.World\net.minecraft.world.Item.alchemy.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #include "Minecraft.h"
-#include <Minecraft.World/Item.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "..\Minecraft.World\Item.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.h"
 #include "CompassTexture.h"
 #include "Minimap.h"
 
diff --git a/Minecraft.Client/ItemInHandRenderer.cpp b/Minecraft.Client/ItemInHandRenderer.cpp
index a82163d22..74f3e26ca 100644
--- a/Minecraft.Client/ItemInHandRenderer.cpp
+++ b/Minecraft.Client/ItemInHandRenderer.cpp
@@ -11,12 +11,12 @@
 #include "MultiPlayerLocalPlayer.h"
 #include "Minimap.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 ResourceLocation ItemInHandRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT);
 ResourceLocation ItemInHandRenderer::MAP_BACKGROUND_LOCATION = ResourceLocation(TN_MISC_MAPBG);
diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp
index 0c4b942b6..49e25060c 100644
--- a/Minecraft.Client/ItemRenderer.cpp
+++ b/Minecraft.Client/ItemRenderer.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 #include "ItemRenderer.h"
 #include "TileRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "entityRenderDispatcher.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 #include "Options.h"
 #include "TextureAtlas.h"
 
diff --git a/Minecraft.Client/ItemSpriteRenderer.cpp b/Minecraft.Client/ItemSpriteRenderer.cpp
index 1c73989b0..5f1c7089b 100644
--- a/Minecraft.Client/ItemSpriteRenderer.cpp
+++ b/Minecraft.Client/ItemSpriteRenderer.cpp
@@ -2,10 +2,10 @@
 #include "ItemSpriteRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "TextureAtlas.h"
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.item.alchemy.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 ItemSpriteRenderer::ItemSpriteRenderer(Item *sourceItem, int sourceItemAuxValue /*= 0*/) : EntityRenderer()
 {
diff --git a/Minecraft.Client/JoinMultiplayerScreen.cpp b/Minecraft.Client/JoinMultiplayerScreen.cpp
index faa4f0a7f..a98e7bee1 100644
--- a/Minecraft.Client/JoinMultiplayerScreen.cpp
+++ b/Minecraft.Client/JoinMultiplayerScreen.cpp
@@ -3,7 +3,7 @@
 #include "Button.h"
 #include "EditBox.h"
 #include "Options.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 JoinMultiplayerScreen::JoinMultiplayerScreen(Screen *lastScreen)
 {
diff --git a/Minecraft.Client/LavaParticle.cpp b/Minecraft.Client/LavaParticle.cpp
index 580c51958..ac0608e59 100644
--- a/Minecraft.Client/LavaParticle.cpp
+++ b/Minecraft.Client/LavaParticle.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "LavaParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 
 LavaParticle::LavaParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/LavaSlimeModel.cpp b/Minecraft.Client/LavaSlimeModel.cpp
index 173307ff8..052850f81 100644
--- a/Minecraft.Client/LavaSlimeModel.cpp
+++ b/Minecraft.Client/LavaSlimeModel.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "LavaSlimeModel.h"
 #include "ModelPart.h"
-#include <Minecraft.World/LavaSlime.h>
+#include "..\Minecraft.World\LavaSlime.h"
 
 
 LavaSlimeModel::LavaSlimeModel() 
diff --git a/Minecraft.Client/LavaSlimeRenderer.cpp b/Minecraft.Client/LavaSlimeRenderer.cpp
index 949ee0e4b..e828a353b 100644
--- a/Minecraft.Client/LavaSlimeRenderer.cpp
+++ b/Minecraft.Client/LavaSlimeRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "LavaSlimeModel.h"
 #include "LavaSlimeRenderer.h"
 
diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp
index d78061846..8216f1fe9 100644
--- a/Minecraft.Client/LevelRenderer.cpp
+++ b/Minecraft.Client/LevelRenderer.cpp
@@ -41,32 +41,32 @@
 #include "Lighting.h"
 #include "Options.h"
 #include "MultiPlayerChunkCache.h"
-#include <Minecraft.World/ParticleTypes.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include "MultiPlayerLocalPlayer.h"
+#include "..\Minecraft.World\ParticleTypes.h"
+#include "..\Minecraft.World\IntCache.h"
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "MultiplayerLocalPlayer.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/SoundTypes.h>
+#include "..\Minecraft.World\SoundTypes.h"
 #include "FrustumCuller.h"
-#include <Minecraft.World/BasicTypeContainers.h>
+#include "..\Minecraft.World\BasicTypeContainers.h"
 
 //#define DISABLE_SPU_CODE
 
 #ifdef __PS3__
-#include <PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h>
-#include <PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h>
+#include "PS3\SPU_Tasks\LevelRenderer_cull\LevelRenderer_cull.h"
+#include "PS3\SPU_Tasks\LevelRenderer_FindNearestChunk\LevelRenderer_FindNearestChunk.h"
 #include "C4JSpursJob.h"
 
 static LevelRenderer_cull_DataIn g_cullDataIn[4] __attribute__((__aligned__(16)));
diff --git a/Minecraft.Client/LevelRenderer.h b/Minecraft.Client/LevelRenderer.h
index aa8b5fa4e..46a4c31fe 100644
--- a/Minecraft.Client/LevelRenderer.h
+++ b/Minecraft.Client/LevelRenderer.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <Minecraft.World/LevelListener.h>
-#include <Minecraft.World/Definitions.h>
+#include "..\Minecraft.World\LevelListener.h"
+#include "..\Minecraft.World\Definitions.h"
 #include "OffsettedRenderList.h"
-#include <Minecraft.World/JavaIntHash.h>
-#include <Minecraft.World/Level.h>
+#include "..\Minecraft.World\JavaIntHash.h"
+#include "..\Minecraft.World\Level.h"
 #include "ResourceLocation.h"
 #include <xmcore.h>
 #ifdef __PS3__
diff --git a/Minecraft.Client/Lighting.cpp b/Minecraft.Client/Lighting.cpp
index a64ddadf4..50529d516 100644
--- a/Minecraft.Client/Lighting.cpp
+++ b/Minecraft.Client/Lighting.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Lighting.h"
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/Vec3.h>
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\Vec3.h"
 
 FloatBuffer *Lighting::lb = new FloatBuffer(16);
 
diff --git a/Minecraft.Client/LightningBoltRenderer.cpp b/Minecraft.Client/LightningBoltRenderer.cpp
index cb2866630..d02ea7f71 100644
--- a/Minecraft.Client/LightningBoltRenderer.cpp
+++ b/Minecraft.Client/LightningBoltRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "LightningBoltRenderer.h"
 #include "Tesselator.h"
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
 
 void LightningBoltRenderer::render(shared_ptr<Entity> _bolt, double x, double y, double z, float rot, float a)
 {
diff --git a/Minecraft.Client/LivingEntityRenderer.cpp b/Minecraft.Client/LivingEntityRenderer.cpp
index 57e4970b7..89d656142 100644
--- a/Minecraft.Client/LivingEntityRenderer.cpp
+++ b/Minecraft.Client/LivingEntityRenderer.cpp
@@ -5,9 +5,9 @@
 #include "ModelPart.h"
 #include "EntityRenderDispatcher.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/Arrow.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/Player.h>
+#include "..\Minecraft.World\Arrow.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\Player.h"
 
 
 ResourceLocation LivingEntityRenderer::ENCHANT_GLINT_LOCATION = ResourceLocation(TN__BLUR__MISC_GLINT);
diff --git a/Minecraft.Client/LivingEntityRenderer.h b/Minecraft.Client/LivingEntityRenderer.h
index 0499a1e56..2f77e1b54 100644
--- a/Minecraft.Client/LivingEntityRenderer.h
+++ b/Minecraft.Client/LivingEntityRenderer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "ResourceLocation.h"
 #include "EntityRenderer.h"
-#include <Minecraft.World/LivingEntity.h>
+#include "..\Minecraft.World\LivingEntity.h"
 
 class LivingEntity;
 
diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp
index f3970a7d7..bb25105f7 100644
--- a/Minecraft.Client/LocalPlayer.cpp
+++ b/Minecraft.Client/LocalPlayer.cpp
@@ -16,45 +16,45 @@
 #include "CreativeMode.h"
 #include "GameRenderer.h"
 #include "ItemInHandRenderer.h"
-#include <Minecraft.World/AttributeInstance.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.damagesource.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/ItemEntity.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/com.mojang.nbt.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/TileEntity.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\AttributeInstance.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\net.minecraft.world.damagesource.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\ItemEntity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\com.mojang.nbt.h"
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\TileEntity.h"
+#include "..\Minecraft.World\Mth.h"
 #include "AchievementPopup.h"
 #include "CritParticle.h"
 
 // 4J : WESTY : Added for new achievements.
-#include <Minecraft.World/Item.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Tile.h>
+#include "..\Minecraft.World\item.h"
+#include "..\Minecraft.World\mapitem.h"
+#include "..\Minecraft.World\tile.h"
 
 // 4J Stu - Added for tutorial callbacks
 #include "Minecraft.h"
 
-#include <Minecraft.World/Minecart.h>
-#include <Minecraft.World/Boat.h>
-#include <Minecraft.World/Pig.h>
+#include "..\Minecraft.World\Minecart.h"
+#include "..\Minecraft.World\Boat.h"
+#include "..\Minecraft.World\Pig.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 #include "Options.h"
-#include <Minecraft.World/Dimension.h>
+#include "..\Minecraft.World\Dimension.h"
 
 #ifndef _DURANGO
-#include <Minecraft.World/CommonStats.h>
+#include "..\Minecraft.World\CommonStats.h"
 #endif
 
 
@@ -1277,7 +1277,7 @@ void LocalPlayer::setAndBroadcastCustomCape(DWORD capeId)
 }
 
 // 4J TODO - Remove
-#include <Minecraft.World/LevelChunk.h>
+#include "..\Minecraft.World\LevelChunk.h"
 void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType)
 {
 	int cx = this->xChunk;
diff --git a/Minecraft.Client/LocalPlayer.h b/Minecraft.Client/LocalPlayer.h
index 0e9c66a7f..0a5b14b2e 100644
--- a/Minecraft.Client/LocalPlayer.h
+++ b/Minecraft.Client/LocalPlayer.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Minecraft.World/SmoothFloat.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/Pos.h>
+#include "..\Minecraft.World\SmoothFloat.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\Pos.h"
 class Level;
 class User;
 class CompoundTag;
diff --git a/Minecraft.Client/MemoryTracker.cpp b/Minecraft.Client/MemoryTracker.cpp
index 3b9d40715..c1652d3b5 100644
--- a/Minecraft.Client/MemoryTracker.cpp
+++ b/Minecraft.Client/MemoryTracker.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "MemoryTracker.h"
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/ByteBuffer.h>
-#include <Minecraft.World/FloatBuffer.h>
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\ByteBuffer.h"
+#include "..\Minecraft.World\FloatBuffer.h"
 
 unordered_map<int,int> MemoryTracker::GL_LIST_IDS;
 vector<int> MemoryTracker::TEXTURE_IDS;
diff --git a/Minecraft.Client/MinecartRenderer.cpp b/Minecraft.Client/MinecartRenderer.cpp
index c74fedaed..fd907019e 100644
--- a/Minecraft.Client/MinecartRenderer.cpp
+++ b/Minecraft.Client/MinecartRenderer.cpp
@@ -2,8 +2,8 @@
 #include "MinecartRenderer.h"
 #include "MinecartModel.h"
 #include "TextureAtlas.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 ResourceLocation MinecartRenderer::MINECART_LOCATION(TN_ITEM_CART);
 
diff --git a/Minecraft.Client/MinecartSpawnerRenderer.cpp b/Minecraft.Client/MinecartSpawnerRenderer.cpp
index 6e3af5897..270db5871 100644
--- a/Minecraft.Client/MinecartSpawnerRenderer.cpp
+++ b/Minecraft.Client/MinecartSpawnerRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "MinecartSpawnerRenderer.h"
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
+#include "../Minecraft.World/Tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
 #include "MobSpawnerRenderer.h"
 
 void MinecartSpawnerRenderer::renderMinecartContents(shared_ptr<MinecartSpawner> cart, float a, Tile *tile, int tileData)
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index acb9365c1..87f1b8bee 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -34,44 +34,44 @@
 #include "FrustumCuller.h"
 #include "Camera.h"
 
-#include <Minecraft.World/MobEffect.h>
-#include <Minecraft.World/Difficulty.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/ByteBuffer.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/Minecraft.World.h>
+#include "..\Minecraft.World\MobEffect.h"
+#include "..\Minecraft.World\Difficulty.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\ByteBuffer.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\Minecraft.World.h"
 #include "ClientConnection.h"
-#include <Minecraft.World/HellRandomLevelSource.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/StrongholdFeature.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/Villager.h>
-#include <Minecraft.World/SparseLightStorage.h>
-#include <Minecraft.World/SparseDataStorage.h>
-#include <Minecraft.World/ChestTileEntity.h>
+#include "..\Minecraft.World\HellRandomLevelSource.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\StrongholdFeature.h"
+#include "..\Minecraft.World\IntCache.h"
+#include "..\Minecraft.World\Villager.h"
+#include "..\Minecraft.World\SparseLightStorage.h"
+#include "..\Minecraft.World\SparseDataStorage.h"
+#include "..\Minecraft.World\ChestTileEntity.h"
 #include "TextureManager.h"
 #ifdef _XBOX
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "Xbox\Network\NetworkPlayerXbox.h"
 #endif
-#include <Common/UI/IUIScene_CreativeMenu.h>
-#include <Common/UI/UIFontData.h>
+#include "Common\UI\IUIScene_CreativeMenu.h"
+#include "Common\UI\UIFontData.h"
 #include "DLCTexturePack.h"
 
 #ifdef __ORBIS__
-#include <Orbis/Network/PsPlusUpsellWrapper_Orbis.h>
+#include "Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
 #endif
 
 // #define DISABLE_SPU_CODE
diff --git a/Minecraft.Client/Minecraft.h b/Minecraft.Client/Minecraft.h
index 2d9fa8cc1..cc1e5d18a 100644
--- a/Minecraft.Client/Minecraft.h
+++ b/Minecraft.Client/Minecraft.h
@@ -38,9 +38,9 @@ class ColourTable;
 class MultiPlayerGameMode;
 class PsPlusUpsellWrapper;
 
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/DisconnectPacket.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\DisconnectPacket.h"
+#include "..\Minecraft.World\C4JThread.h"
 #include "ResourceLocation.h"
 
 using namespace std;
diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index e96e88a3e..4206a3995 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-//#include <Minecraft.h>
+//#include "Minecraft.h"
 
 #include <ctime>
 
@@ -15,44 +15,44 @@
 #include "ServerLevel.h"
 #include "ServerLevelListener.h"
 #include "Settings.h"
-#include <Minecraft.World/Command.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\Command.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\Vec3.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #ifdef SPLIT_SAVES
-#include <Minecraft.World/ConsoleSaveFileSplit.h>
+#include "..\Minecraft.World\ConsoleSaveFileSplit.h"
 #endif
-#include <Minecraft.World/ConsoleSaveFileOriginal.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
+#include "..\Minecraft.World\ConsoleSaveFileOriginal.h"
+#include "..\Minecraft.World\Socket.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
 #include "ProgressRenderer.h"
 #include "ServerPlayer.h"
 #include "GameRenderer.h"
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.World/IntCache.h>
-#include <Minecraft.World/CompressedTileStorage.h>
-#include <Minecraft.World/SparseLightStorage.h>
-#include <Minecraft.World/SparseDataStorage.h>
-#include <Minecraft.World/compression.h>
+#include "..\Minecraft.World\ThreadName.h"
+#include "..\Minecraft.World\IntCache.h"
+#include "..\Minecraft.World\CompressedTileStorage.h"
+#include "..\Minecraft.World\SparseLightStorage.h"
+#include "..\Minecraft.World\SparseDataStorage.h"
+#include "..\Minecraft.World\compression.h"
 #ifdef _XBOX
-#include <Common/XUI/XUI_DebugSetCamera.h>
+#include "Common\XUI\XUI_DebugSetCamera.h"
 #endif
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "PS3\PS3Extras\ShutdownManager.h"
 #include "ServerCommandDispatcher.h"
-#include <Minecraft.World/BiomeSource.h>
+#include "..\Minecraft.World\BiomeSource.h"
 #include "PlayerChunkMap.h"
-#include <Common/Telemetry/TelemetryManager.h>
+#include "Common\Telemetry\TelemetryManager.h"
 #include "PlayerConnection.h"
 #ifdef _XBOX_ONE
-#include <Durango/Network/NetworkPlayerDurango.h>
+#include "Durango\Network\NetworkPlayerDurango.h"
 #endif
 
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
diff --git a/Minecraft.Client/MinecraftServer.h b/Minecraft.Client/MinecraftServer.h
index 8aebef972..5f33fa853 100644
--- a/Minecraft.Client/MinecraftServer.h
+++ b/Minecraft.Client/MinecraftServer.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ConsoleInputSource.h"
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\C4JThread.h"
 
 class ServerConnection;
 class Settings;
diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp
index 139674865..c18cd267a 100644
--- a/Minecraft.Client/Minimap.cpp
+++ b/Minecraft.Client/Minimap.cpp
@@ -5,8 +5,8 @@
 #include "Options.h"
 #include "Textures.h"
 #include "Tesselator.h"
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
 
 #ifdef __ORBIS__
 short Minimap::LUT[256];	// 4J added
diff --git a/Minecraft.Client/Minimap.h b/Minecraft.Client/Minimap.h
index 28819590e..758d8a8ad 100644
--- a/Minecraft.Client/Minimap.h
+++ b/Minecraft.Client/Minimap.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/MapItem.h>
+#include "..\Minecraft.World\MapItem.h"
 class Options;
 class Font;
 class Textures;
diff --git a/Minecraft.Client/MobRenderer.cpp b/Minecraft.Client/MobRenderer.cpp
index b79a832ca..ee5125302 100644
--- a/Minecraft.Client/MobRenderer.cpp
+++ b/Minecraft.Client/MobRenderer.cpp
@@ -2,12 +2,12 @@
 #include "MobRenderer.h"
 #include "LivingEntityRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/Mth.h>
-#include "EntityRenderDispatcher.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\Mth.h"
+#include "entityRenderDispatcher.h"
 
 MobRenderer::MobRenderer(Model *model, float shadow) : LivingEntityRenderer(model, shadow)
 {
diff --git a/Minecraft.Client/MobSpawnerRenderer.cpp b/Minecraft.Client/MobSpawnerRenderer.cpp
index 8e84c74c7..02aac27fd 100644
--- a/Minecraft.Client/MobSpawnerRenderer.cpp
+++ b/Minecraft.Client/MobSpawnerRenderer.cpp
@@ -2,8 +2,8 @@
 #include "MobSpawnerRenderer.h"
 #include "TileEntityRenderDispatcher.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
 
 void MobSpawnerRenderer::render(shared_ptr<TileEntity> _spawner, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled)
 {
diff --git a/Minecraft.Client/Model.h b/Minecraft.Client/Model.h
index 5ce7ff395..5a4b6f2e8 100644
--- a/Minecraft.Client/Model.h
+++ b/Minecraft.Client/Model.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
-#include <Minecraft.World/Random.h>
-#include <Minecraft.Client/SkinBox.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.Client\SkinBox.h"
 class Mob;
 class ModelPart;
 class TexOffs;
diff --git a/Minecraft.Client/ModelHorse.cpp b/Minecraft.Client/ModelHorse.cpp
index fc6764e22..7a13d0adc 100644
--- a/Minecraft.Client/ModelHorse.cpp
+++ b/Minecraft.Client/ModelHorse.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "ModelHorse.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/ModelPart.h b/Minecraft.Client/ModelPart.h
index 6ca93795f..c6458e71d 100644
--- a/Minecraft.Client/ModelPart.h
+++ b/Minecraft.Client/ModelPart.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 #include "Vertex.h"
 #include "Polygon.h"
 #include "Model.h"
-#include <Minecraft.Client/SkinBox.h>
+#include "..\Minecraft.Client\SkinBox.h"
 
 class Cube;
 
diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp
index 5079bbb00..b5e1dd255 100644
--- a/Minecraft.Client/MultiPlayerChunkCache.cpp
+++ b/Minecraft.Client/MultiPlayerChunkCache.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 #include "MultiPlayerChunkCache.h"
 #include "ServerChunkCache.h"
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/Arrays.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\Arrays.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/WaterLevelChunk.h>
+#include "..\Minecraft.World\Tile.h"
+#include "..\Minecraft.World\WaterLevelChunk.h"
 
 MultiPlayerChunkCache::MultiPlayerChunkCache(Level *level)
 {
diff --git a/Minecraft.Client/MultiPlayerChunkCache.h b/Minecraft.Client/MultiPlayerChunkCache.h
index 8234c4d98..c180f8584 100644
--- a/Minecraft.Client/MultiPlayerChunkCache.h
+++ b/Minecraft.Client/MultiPlayerChunkCache.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/RandomLevelSource.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\RandomLevelSource.h"
 
 using namespace std;
 class ServerChunkCache;
diff --git a/Minecraft.Client/MultiPlayerGameMode.cpp b/Minecraft.Client/MultiPlayerGameMode.cpp
index b404b67a1..e7611b37c 100644
--- a/Minecraft.Client/MultiPlayerGameMode.cpp
+++ b/Minecraft.Client/MultiPlayerGameMode.cpp
@@ -6,13 +6,13 @@
 #include "Minecraft.h"
 #include "ClientConnection.h"
 #include "LevelRenderer.h"
-#include <Common/Network/GameNetworkManager.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "Common\Network\GameNetworkManager.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.h"
 
 MultiPlayerGameMode::MultiPlayerGameMode(Minecraft *minecraft, ClientConnection *connection)
 {
diff --git a/Minecraft.Client/MultiPlayerLevel.cpp b/Minecraft.Client/MultiPlayerLevel.cpp
index cae86ce67..5c27e4502 100644
--- a/Minecraft.Client/MultiPlayerLevel.cpp
+++ b/Minecraft.Client/MultiPlayerLevel.cpp
@@ -3,17 +3,17 @@
 #include "MultiPlayerLocalPlayer.h"
 #include "ClientConnection.h"
 #include "MultiPlayerChunkCache.h"
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/Pos.h>
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\Pos.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
 #include "Minecraft.h"
 #include "FireworksParticles.h"
-#include <Minecraft.World/PrimedTnt.h>
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/TileEntity.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\PrimedTnt.h"
+#include "..\Minecraft.World\Tile.h"
+#include "..\Minecraft.World\TileEntity.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, int data)
 {
diff --git a/Minecraft.Client/MultiPlayerLevel.h b/Minecraft.Client/MultiPlayerLevel.h
index d86976e5c..6e5b00865 100644
--- a/Minecraft.Client/MultiPlayerLevel.h
+++ b/Minecraft.Client/MultiPlayerLevel.h
@@ -1,9 +1,9 @@
 #pragma once
 using namespace std;
-#include <Minecraft.World/HashExtension.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\HashExtension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\JavaIntHash.h"
 
 class ClientConnection;
 class MultiPlayerChunkCache;
diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
index e2e02cb4e..25bf06bf1 100644
--- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp
+++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-//#include <Minecraft.World/JavaMath.h>
-#include "MultiPlayerLocalPlayer.h"
+//#include "..\Minecraft.World\JavaMath.h"
+#include "MultiplayerLocalPlayer.h"
 #include "ClientConnection.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.effect.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.effect.h"
+#include "..\Minecraft.World\LevelData.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
 #include "Input.h"
 #include "LevelRenderer.h"
 
diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.h b/Minecraft.Client/MultiPlayerLocalPlayer.h
index d8ac445c1..e660a96a2 100644
--- a/Minecraft.Client/MultiPlayerLocalPlayer.h
+++ b/Minecraft.Client/MultiPlayerLocalPlayer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "LocalPlayer.h"
-#include <Minecraft.World/SharedConstants.h>
+#include "..\Minecraft.World\SharedConstants.h"
 
 class ClientConnection;
 class Minecraft;
diff --git a/Minecraft.Client/MushroomCowRenderer.cpp b/Minecraft.Client/MushroomCowRenderer.cpp
index 8936a1167..b5f9ba9f8 100644
--- a/Minecraft.Client/MushroomCowRenderer.cpp
+++ b/Minecraft.Client/MushroomCowRenderer.cpp
@@ -3,8 +3,8 @@
 #include "MushroomCowRenderer.h"
 #include "TextureAtlas.h"
 #include "QuadrupedModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 ResourceLocation MushroomCowRenderer::MOOSHROOM_LOCATION = ResourceLocation(TN_MOB_RED_COW);
 
diff --git a/Minecraft.Client/NameEntryScreen.cpp b/Minecraft.Client/NameEntryScreen.cpp
index 1175ea9b2..c9df70245 100644
--- a/Minecraft.Client/NameEntryScreen.cpp
+++ b/Minecraft.Client/NameEntryScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NameEntryScreen.h"
 #include "Button.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 const wstring NameEntryScreen::allowedChars = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,.:-_'*!\"#%/()=+?[]{}<>";
 
diff --git a/Minecraft.Client/NetherPortalParticle.cpp b/Minecraft.Client/NetherPortalParticle.cpp
index ad73d264e..4b70d38f5 100644
--- a/Minecraft.Client/NetherPortalParticle.cpp
+++ b/Minecraft.Client/NetherPortalParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NetherPortalParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Random.h"
 #include "Minecraft.h"
 
 // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle
diff --git a/Minecraft.Client/NoteParticle.cpp b/Minecraft.Client/NoteParticle.cpp
index 3884a78db..2e2320c8a 100644
--- a/Minecraft.Client/NoteParticle.cpp
+++ b/Minecraft.Client/NoteParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "NoteParticle.h"
 
 void NoteParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/OcelotModel.cpp b/Minecraft.Client/OcelotModel.cpp
index 74a7938f7..8e8455979 100644
--- a/Minecraft.Client/OcelotModel.cpp
+++ b/Minecraft.Client/OcelotModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\Mth.h"
 #include "OcelotModel.h"
 
 const float OcelotModel::xo = 0;
diff --git a/Minecraft.Client/OcelotRenderer.cpp b/Minecraft.Client/OcelotRenderer.cpp
index e0ffe6f6d..3672714b3 100644
--- a/Minecraft.Client/OcelotRenderer.cpp
+++ b/Minecraft.Client/OcelotRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "OcelotRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation OcelotRenderer::CAT_BLACK_LOCATION = ResourceLocation(TN_MOB_CAT_BLACK);
 ResourceLocation OcelotRenderer::CAT_OCELOT_LOCATION = ResourceLocation(TN_MOB_OCELOT);
diff --git a/Minecraft.Client/OffsettedRenderList.cpp b/Minecraft.Client/OffsettedRenderList.cpp
index 6b9750599..729d26f92 100644
--- a/Minecraft.Client/OffsettedRenderList.cpp
+++ b/Minecraft.Client/OffsettedRenderList.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/IntBuffer.h>
+#include "..\Minecraft.World\IntBuffer.h"
 #include "OffsettedRenderList.h"
 
 // 4J added
diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp
index 21f63d801..c18c136bc 100644
--- a/Minecraft.Client/Options.cpp
+++ b/Minecraft.Client/Options.cpp
@@ -3,16 +3,16 @@
 #include "KeyMapping.h"
 #include "LevelRenderer.h"
 #include "Textures.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/BufferedReader.h>
-#include <Minecraft.World/DataInputStream.h>
-#include <Minecraft.World/InputStreamReader.h>
-#include <Minecraft.World/FileInputStream.h>
-#include <Minecraft.World/FileOutputStream.h>
-#include <Minecraft.World/DataOutputStream.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\Language.h"
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\BufferedReader.h"
+#include "..\Minecraft.World\DataInputStream.h"
+#include "..\Minecraft.World\InputStreamReader.h"
+#include "..\Minecraft.World\FileInputStream.h"
+#include "..\Minecraft.World\FileOutputStream.h"
+#include "..\Minecraft.World\DataOutputStream.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 // 4J - the Option sub-class used to be an java enumerated type, trying to emulate that functionality here
 const Options::Option Options::Option::options[17] =
diff --git a/Minecraft.Client/Options.h b/Minecraft.Client/Options.h
index d0ad8beb1..8be61ac6e 100644
--- a/Minecraft.Client/Options.h
+++ b/Minecraft.Client/Options.h
@@ -2,7 +2,7 @@
 using namespace std;
 class Minecraft;
 class KeyMapping;
-#include <Minecraft.World/File.h>
+#include "..\Minecraft.World\File.h"
 
 class Options
 {
diff --git a/Minecraft.Client/OptionsScreen.cpp b/Minecraft.Client/OptionsScreen.cpp
index b36a2c9bb..b5c2f5e60 100644
--- a/Minecraft.Client/OptionsScreen.cpp
+++ b/Minecraft.Client/OptionsScreen.cpp
@@ -5,7 +5,7 @@
 #include "Options.h"
 #include "ControlsScreen.h"
 #include "VideoSettingsScreen.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 OptionsScreen::OptionsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/Orbis/Iggy/include/iggy.h b/Minecraft.Client/Orbis/Iggy/include/iggy.h
index b160d53c7..56638a321 100644
--- a/Minecraft.Client/Orbis/Iggy/include/iggy.h
+++ b/Minecraft.Client/Orbis/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include <rrcore.h>   // base data types, macros
+#include "rrcore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
index 66bf343fe..b76621970 100644
--- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
+++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
@@ -4,19 +4,19 @@
 
 #include "base64.h"
 
-#include <Orbis_App.h>
-#include <Common/Consoles_App.h>
+#include "..\Orbis_App.h"
+#include "..\..\Common\Consoles_App.h"
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "Common\Network\Sony\SQRNetworkManager.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include <cstdlib>
 
 #include <np.h>
 //#include <sys/ppu_thread.h>
 
-#include <Orbis/OrbisExtras/ShutdownManager.h>
+#include "Orbis\OrbisExtras\ShutdownManager.h"
 
 
 LeaderboardManager *LeaderboardManager::m_instance = new OrbisLeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
index 23017319d..c2243a93e 100644
--- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
+++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 class OrbisLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
index 63569af26..d1c9cf15f 100644
--- a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
+++ b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include "Orbis_NPToolkit.h"
-#include <Orbis/ps4__np_conf.h>
-#include <Orbis/Network/SonyCommerce_Orbis.h>
+#include "Orbis\ps4__np_conf.h"
+#include "Orbis/Network/SonyCommerce_Orbis.h"
 
 // #define NP_TITLE_ID "CUSA00265_00"
 // #define NP_TITLE_SECRET_HEX "c37e30fa1f7fd29e3534834d62781143ae29aa7b51d02320e7aa0b45116ad600e4d309e8431bc37977d98b8db480e721876e7d736e11fd906778c0033bbb6370903477b1dc1e65106afc62007a5feee3158844d721b88c3f4bff2e56417b6910cedfdec78b130d2e0dd35a35a9e2ae31d5889f9398c1d62b52a3630bb03faa5b"
diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
index 7804539f8..5c02cb08e 100644
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
@@ -9,12 +9,12 @@
 #include <error_dialog.h>
 #include <system_service.h>
 
-#include <ps4__np_conf.h>
+#include "../ps4__np_conf.h"
 #include "Orbis_NPToolkit.h"
 #include "SonyVoiceChat_Orbis.h"
-#include <Common/Network/Sony/SonyHttp.h>
-#include <Minecraft.World/C4JThread.h>
-// #include <PS3Extras/PS3Strings.h>
+#include "Common\Network\Sony\SonyHttp.h"
+#include "..\..\..\Minecraft.World\C4JThread.h"
+// #include "..\PS3Extras\PS3Strings.h"
 
 
 int (* SQRNetworkManager_Orbis::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL;
diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
index cbca93300..5b19f63ec 100644
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
@@ -6,9 +6,9 @@
 #include <queue>
 
 #include <unordered_map>
-// #include <SonyVoiceChat_Orbis.h>
+// #include "SonyVoiceChat_Orbis.h"
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
index dbd338389..34ab67e40 100644
--- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce_Orbis.h"
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "PS3\PS3Extras\ShutdownManager.h"
 #include <sys/event.h>
 
 
diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
index 3ceab5483..a2a42d574 100644
--- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/Sony/SonyCommerce.h>
+#include "Common\Network\Sony\SonyCommerce.h"
 class OrbisNPToolkit;
 	
 class SonyCommerce_Orbis : public SonyCommerce
diff --git a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.cpp
index e21ca8729..e248f602c 100644
--- a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.cpp
@@ -14,7 +14,7 @@
 // #include <sysutil/sysutil_common.h>
 // #include <sys/timer.h>
 // #include <sys/paths.h>
-// #include <sysutil/sysutil_savedata.h>
+// #include <sysutil\sysutil_savedata.h>
 
 
 
diff --git a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
index d842ccacb..0b36c41d0 100644
--- a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "Common\Network\Sony\SonyRemoteStorage.h"
 
 class SonyRemoteStorage_Orbis : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/Orbis/Network/SonyVoiceChatParty_Orbis.h b/Minecraft.Client/Orbis/Network/SonyVoiceChatParty_Orbis.h
index e2a7ae72e..84f19c293 100644
--- a/Minecraft.Client/Orbis/Network/SonyVoiceChatParty_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyVoiceChatParty_Orbis.h
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <np/np_party.h>
+#include <np\np_party.h>
 
 class SonyVoiceChatParty_Orbis
 {
diff --git a/Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.h b/Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.h
index 23e305d61..950ca09a6 100644
--- a/Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyVoiceChat_Orbis.h
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <voice_qos.h>
-#include <Common/Network/Sony/SQRNetworkPlayer.h>
+#include "Common/Network/Sony/SQRNetworkPlayer.h"
 
 static const int sc_maxVoiceDataSize = 2048;
 
diff --git a/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h b/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h
index 2bf7ebac6..006a0060e 100644
--- a/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h
+++ b/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h
@@ -1,6 +1,6 @@
 #pragma once
 
-//#include <winerror.h>
+//#include "winerror.h"
 
 typedef unsigned int       DWORD;
 typedef int                 BOOL;
diff --git a/Minecraft.Client/Orbis/Orbis_App.cpp b/Minecraft.Client/Orbis/Orbis_App.cpp
index bf9ddd8d6..9af5ee120 100644
--- a/Minecraft.Client/Orbis/Orbis_App.cpp
+++ b/Minecraft.Client/Orbis/Orbis_App.cpp
@@ -1,22 +1,22 @@
 
 #include "stdafx.h"
-#include <Common/Consoles_App.h>
-#include <User.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/LevelType.h>
-#include <Orbis/Network/SonyCommerce_Orbis.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Network/Orbis_NPToolkit.h>
-#include <Orbis/Network/SonyRemoteStorage_Orbis.h>
+#include "..\Common\Consoles_App.h"
+#include "..\User.h"
+#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\Minecraft.Client\MinecraftServer.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\Minecraft.World\LevelType.h"
+#include "..\..\Orbis\Network\SonyCommerce_Orbis.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "Network/Orbis_NPToolkit.h"
+#include "Orbis\Network\SonyRemoteStorage_Orbis.h"
 
 #include <system_service.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
 #include <save_data_dialog.h>
 #include <error_dialog.h>
 
diff --git a/Minecraft.Client/Orbis/Orbis_App.h b/Minecraft.Client/Orbis/Orbis_App.h
index 6202c44ce..1c09579f7 100644
--- a/Minecraft.Client/Orbis/Orbis_App.h
+++ b/Minecraft.Client/Orbis/Orbis_App.h
@@ -3,8 +3,8 @@
 class C4JStringTable;
 #include <np_toolkit.h>
 
-#include <Common/Network/Sony/SonyCommerce.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "..\..\Common\Network\Sony\SonyCommerce.h"
+#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
index 7ff8ba5fc..947b9df8b 100644
--- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
+++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
@@ -6,41 +6,41 @@
 #include <assert.h>
 #include <system_service.h>
 #include <codecvt>
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-//#include <Social/SocialManager.h>
-//#include <Leaderboards/LeaderboardManager.h>
-//#include <XUI/XUI_Scene_Container.h>
-//#include <NetworkManager.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <Leaderboards/OrbisLeaderboardManager.h>
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+//#include "Social\SocialManager.h"
+//#include "Leaderboards\LeaderboardManager.h"
+//#include "XUI\XUI_Scene_Container.h"
+//#include "NetworkManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
+#include "Leaderboards\OrbisLeaderboardManager.h"
 
-#include <Network/Orbis_NPToolkit.h>
-#include <Orbis/Network/SonyVoiceChat_Orbis.h>
+#include "Network/Orbis_NPToolkit.h"
+#include "Orbis\Network\SonyVoiceChat_Orbis.h"
 
 #define THEME_NAME		"584111F70AAAAAAA"
 #define THEME_FILESIZE	2797568
diff --git a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
index 56205413c..114e6ae8e 100644
--- a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
+++ b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 #include "Orbis_PlayerUID.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 #include <libnetctl.h>
 
diff --git a/Minecraft.Client/Orbis/Orbis_UIController.cpp b/Minecraft.Client/Orbis/Orbis_UIController.cpp
index 8839e3692..38cc79e94 100644
--- a/Minecraft.Client/Orbis/Orbis_UIController.cpp
+++ b/Minecraft.Client/Orbis/Orbis_UIController.cpp
@@ -2,8 +2,8 @@
 #include "Orbis_UIController.h"
 
 // Temp
-#include <Minecraft.h>
-#include <Textures.h>
+#include "..\Minecraft.h"
+#include "..\Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/Orbis/Orbis_UIController.h b/Minecraft.Client/Orbis/Orbis_UIController.h
index c92a51009..fcd901e22 100644
--- a/Minecraft.Client/Orbis/Orbis_UIController.h
+++ b/Minecraft.Client/Orbis/Orbis_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIController.h>
+#include "..\Common\UI\UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/Orbis/user_malloc.cpp b/Minecraft.Client/Orbis/user_malloc.cpp
index 333ca7bf5..6a85e83b5 100644
--- a/Minecraft.Client/Orbis/user_malloc.cpp
+++ b/Minecraft.Client/Orbis/user_malloc.cpp
@@ -9,7 +9,7 @@ extern "C"
 #include <stdlib.h>
 #include <mspace.h>
 #include <kernel.h>
-#include <Minecraft.World/System.h>
+#include "..\Minecraft.World\System.h"
 
 static size_t s_heapLength;
 static size_t s_memLength;
diff --git a/Minecraft.Client/OzelotModel.cpp b/Minecraft.Client/OzelotModel.cpp
index 600d7aa39..9c22cc4b7 100644
--- a/Minecraft.Client/OzelotModel.cpp
+++ b/Minecraft.Client/OzelotModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\Mth.h"
 #include "OzelotModel.h"
 
 const float OzelotModel::xo = 0;
diff --git a/Minecraft.Client/OzelotRenderer.cpp b/Minecraft.Client/OzelotRenderer.cpp
index 9bbbdfb3f..d56b35f9b 100644
--- a/Minecraft.Client/OzelotRenderer.cpp
+++ b/Minecraft.Client/OzelotRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "OzelotRenderer.h"
 
 OzelotRenderer::OzelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
diff --git a/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp b/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp
index a00b667e2..f3d2729f0 100644
--- a/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp
+++ b/Minecraft.Client/PS3/4JLibs/STO_TitleSmallStorage.cpp
@@ -18,7 +18,7 @@
 #include <sysutil/sysutil_savedata.h>
 
 #include "STO_TitleSmallStorage.h"
-#include <Passphrase/ps3__np_conf.h>
+#include "../Passphrase/ps3__np_conf.h"
 
 
 
diff --git a/Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h b/Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h
index 773f94e1b..3950bbad6 100644
--- a/Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h
+++ b/Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include <sysutil/sysutil_savedata.h>
+#include <sysutil\sysutil_savedata.h>
 #include <cell/cell_fs.h>
 
 
diff --git a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
index eb5789258..fcce5f05a 100644
--- a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
+++ b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
@@ -1,13 +1,13 @@
-#include <stdafx.h>
+#include "..\stdafx.h"
 #include <sysutil/sysutil_sysparam.h>
 #include <cell/sysmodule.h>
 #include <sys/spu_initialize.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <cell/audio.h>
-#include <Common/Audio/SoundEngine.h>
-#include <Common/Consoles_App.h>
-#include <PS3/Miles/include/mss.h>
+#include "..\..\Common\Audio\SoundEngine.h"
+#include "..\..\Common\Consoles_App.h"
+#include "..\..\PS3\Miles\include\mss.h"
 
 // This file has the platform specific functions required for PS3 audio
 
diff --git a/Minecraft.Client/PS3/Iggy/include/iggy.h b/Minecraft.Client/PS3/Iggy/include/iggy.h
index b160d53c7..56638a321 100644
--- a/Minecraft.Client/PS3/Iggy/include/iggy.h
+++ b/Minecraft.Client/PS3/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include <rrcore.h>   // base data types, macros
+#include "rrcore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
index 12bc0ed1f..38380bfb4 100644
--- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
+++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
@@ -4,19 +4,19 @@
 
 #include "base64.h"
 
-#include <PS3_App.h>
-#include <Common/Consoles_App.h>
+#include "..\PS3_App.h"
+#include "..\..\Common\Consoles_App.h"
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "Common\Network\Sony\SQRNetworkManager.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include <cstdlib>
 
 #include <np.h>
 #include <sys/ppu_thread.h>
 
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "PS3\PS3Extras\ShutdownManager.h"
 
 #ifdef __PS3__
 LeaderboardManager *LeaderboardManager::m_instance = new PS3LeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
index 24de2ece1..7a85896da 100644
--- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
+++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
-#include <Minecraft.World/x64headers/extraX64.h>
+#include "..\..\Common\Leaderboards\LeaderboardManager.h"
+#include "..\..\..\Minecraft.World\x64headers\extraX64.h"
 
-#include <PS3/Passphrase/ps3__np_conf.h>
+#include "PS3\Passphrase\ps3__np_conf.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
index d76894904..46b1916d0 100644
--- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
+++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SQRNetworkManager_PS3.h"
-#include <Common/Network/Sony/SQRNetworkPlayer.h>
+#include "Common/Network/Sony/SQRNetworkPlayer.h"
 #ifdef __PS3__
 #include <sys/random_number.h>
 #include <sys/event.h>
@@ -10,14 +10,14 @@
 #include <rudp.h>
 #include <np_toolkit.h>
 #endif
-#include <Passphrase/ps3__np_conf.h>
+#include "../Passphrase/ps3__np_conf.h"
 #ifdef __PS3__
 #include "SonyVoiceChat.h"
-#include <Common/Network/Sony/SonyHttp.h>
+#include "Common/Network/Sony/SonyHttp.h"
 #endif
-#include <Minecraft.World/C4JThread.h>
-#include <PS3Extras/PS3Strings.h>
-#include <PS3/Network/SonyRemoteStorage_PS3.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "..\PS3Extras\PS3Strings.h"
+#include "PS3\Network\SonyRemoteStorage_PS3.h"
 
 int (* SQRNetworkManager_PS3::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL;
 void * SQRNetworkManager_PS3::s_SignInCompleteParam = NULL;
diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
index 461e11952..6143bbb58 100644
--- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
+++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <np.h>
 #ifdef __PS3__
-#include <netex/libnetctl.h>
-#include <netex/net.h>
+#include <netex\libnetctl.h>
+#include <netex\net.h>
 #else
 #include <libnetctl.h>
 #include <net.h>
 #endif
 #include <queue>
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
index e8382102d..230e03099 100644
--- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
+++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce_PS3.h"
-#include <PS3Extras/ShutdownManager.h>
+#include "..\PS3Extras\ShutdownManager.h"
 #include <sys/event.h>
 
 
diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
index b771d8bab..1f43341a0 100644
--- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
+++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
@@ -6,7 +6,7 @@
 #include <np.h>
 #include <np/drm.h>
 #include <np/commerce2.h>
-#include <Common/Network/Sony/SonyCommerce.h>
+#include "Common\Network\Sony\SonyCommerce.h"
 
 #define SCE_TOOLKIT_NP_SKU_PRICE_LEN	(SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \
 	+ SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \
diff --git a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.cpp b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.cpp
index 45dc61975..bdd58e17c 100644
--- a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.cpp
+++ b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.cpp
@@ -13,7 +13,7 @@
 // #include <sysutil/sysutil_common.h>
 // #include <sys/timer.h>
 // #include <sys/paths.h>
-// #include <sysutil/sysutil_savedata.h>
+// #include <sysutil\sysutil_savedata.h>
 
 
 
diff --git a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
index ba04ec2b9..ffbc57b0b 100644
--- a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
+++ b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include <Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h>
+#include "Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
 
 class SonyRemoteStorage_PS3 : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
index 9f7df9d9d..fd8ddd9ad 100644
--- a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
@@ -7,7 +7,7 @@
 #include <cell/spurs.h>
 #include "C4JSpursJob.h"
 #include "C4JThread_SPU.h"
-// #include <PS3/SPU_Tasks/SPUMemTools/SPUMemTools.h>
+// #include "PS3\SPU_Tasks\SPUMemTools\SPUMemTools.h"
 
 
 using namespace cell::Spurs::JobQueue;
diff --git a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
index 97142d633..94d7ef87d 100644
--- a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
@@ -3,9 +3,9 @@
 #include "stdafx.h"
 
 #include "C4JThread_SPU.h"
-#include <PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h>
-#include <PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h>
-#include <PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks.h>
+#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h"
+#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h"
+#include "PS3\SPU_Tasks\LevelRenderChunks\LevelRenderChunks.h"
 
 #define SPURS_MAX_SPU					6
 #define SPURS_PPU_THREAD_PRIORITY		2
diff --git a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
index 06fbff0b2..3576d7ed0 100644
--- a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
+++ b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
@@ -157,7 +157,7 @@
 #endif
 
 #if defined(_MSC_EXTENSIONS) && !defined( MIDL_PASS ) && !defined(__midl) && !defined(RC_INVOKED)
-#include <codeanalysis/sourceannotations.h>
+#include "codeanalysis\sourceannotations.h"
 #endif
 
 //============================================================================
diff --git a/Minecraft.Client/PS3/PS3Extras/EdgeZLib.cpp b/Minecraft.Client/PS3/PS3Extras/EdgeZLib.cpp
index db94f3b4c..2b0a523fe 100644
--- a/Minecraft.Client/PS3/PS3Extras/EdgeZLib.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/EdgeZLib.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include <stdlib.h>
 #include "EdgeZLib.h"
-#include <edge/zlib/edgezlib_ppu.h>
+#include "edge/zlib/edgezlib_ppu.h"
 
 static CellSpurs* s_pSpurs = NULL;
 
diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp
index b699d8d6a..e3417e425 100644
--- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Hook/PS3/Main.cpp
@@ -1,5 +1,5 @@
-#include <Server/HeapInspectorServer.h>
-#include <Server/PS3/HeapHooks.hpp>
+#include "../../../Server/HeapInspectorServer.h"
+#include "../../../Server/PS3/HeapHooks.hpp"
 
 void RunHeapInspectorServer();
 
diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp
index e8b6caa63..34914717e 100644
--- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/Manual/ManualSample.cpp
@@ -3,7 +3,7 @@
 // how to configure multiple heaps.
 // =================================================================================================================================
 
-#include <Server/HeapInspectorServer.h>
+#include "../../Server/HeapInspectorServer.h"
 #include <stdlib.h>
 
 using namespace HeapInspectorServer;
diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp
index b699d8d6a..e3417e425 100644
--- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/Main.cpp
@@ -1,5 +1,5 @@
-#include <Server/HeapInspectorServer.h>
-#include <Server/PS3/HeapHooks.hpp>
+#include "../../../Server/HeapInspectorServer.h"
+#include "../../../Server/PS3/HeapHooks.hpp"
 
 void RunHeapInspectorServer();
 
diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp
index 67e45a33d..ed27945ac 100644
--- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/MultiThreadedHook/PS3/ThreadPS3.cpp
@@ -1,5 +1,5 @@
 #include <pthread.h>
-#include <IThread.h>
+#include "../IThread.h"
 
 void* InternalThread(void* a_UserData)
 {
diff --git a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp
index 0f8380055..305d589b5 100644
--- a/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/HeapInspector/Samples/ReplaceNewDelete/ReplaceNewDeleteSample.cpp
@@ -8,7 +8,7 @@
 // sign that the operators aren't properly matched.
 // =================================================================================================================================
 
-#include <Server/HeapInspectorServer.h>
+#include "../../Server/HeapInspectorServer.h"
 #include <stdlib.h>
 #include <new>
 
diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
index 86c35dcd4..b6cf351de 100644
--- a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
+++ b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
@@ -10,15 +10,15 @@
 #include <stddef.h>
 #include <boost/typeof/typeof.hpp>
 #include <boost/tr1/memory.hpp>
-#include <boost/tr1/unordered_map.hpp>
-#include <boost/tr1/unordered_set.hpp>
-#include <boost/pool/pool_alloc.hpp>
+#include "boost/tr1/unordered_map.hpp"
+#include "boost/tr1/unordered_set.hpp"
+#include "boost/pool/pool_alloc.hpp"
 #include <boost/mpl/equal_to.hpp>
 
 
 #define __forceinline inline
 
-//#include <winerror.h>
+//#include "winerror.h"
 
 using std::tr1::bad_weak_ptr;
 using std::tr1::const_pointer_cast;
@@ -71,7 +71,7 @@ extern Cnullptr nullptr;
 
 
 // #include <math.h>
-// #include <DirectX/DirectXMath.h>
+// #include "DirectX\DirectXMath.h"
 // using namespace DirectX;
 
 #define S_OK 0
diff --git a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
index 0c22c42e0..e7eca53f4 100644
--- a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ShutdownManager.h"
-#include <Common/Leaderboards/LeaderboardManager.h>
-#include <MinecraftServer.h>
+#include "..\..\Common\Leaderboards\LeaderboardManager.h"
+#include "..\..\MinecraftServer.h"
 #ifdef __PS3__
 #include "C4JSpursJob.h"
 
diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/impl/src.cpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/impl/src.cpp
index 0eb7a8260..1150954b5 100644
--- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/impl/src.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/asio/impl/src.cpp
@@ -13,13 +13,13 @@
   || defined(__DMC__)
 # pragma message ( \
     "This file is deprecated. " \
-    <Please #include <boost/asio/impl/src.hpp> instead.>)
+    "Please #include <boost/asio/impl/src.hpp> instead.>)
 #elif defined(__GNUC__) \
   || defined(__HP_aCC) \
   || defined(__SUNPRO_CC) \
   || defined(__IBMCPP__)
 # warning "This file is deprecated."
-# warning <Please #include <boost/asio/impl/src.hpp> instead.>
+# warning "Please #include <boost/asio/impl/src.hpp> instead.>
 #endif
 
 #include <boost/asio/impl/src.hpp>
diff --git a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
index 28f8dbe11..aa36fb4d9 100644
--- a/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
@@ -453,7 +453,7 @@ void print_head(Out& out)
         << "\n"
         << "    AUTOGENERATED. DO NOT EDIT!!!\n"
         << "==============================================================================*/\n"
-        << <#include <boost/cstdint.hpp>/n>
+        << "#include <boost/cstdint.hpp>\n"
         << "\n"
         << "namespace boost { namespace spirit { namespace ucd { namespace detail\n"
         << "{"
diff --git a/Minecraft.Client/PS3/PS3_App.cpp b/Minecraft.Client/PS3/PS3_App.cpp
index 74dd517ea..d2ab71501 100644
--- a/Minecraft.Client/PS3/PS3_App.cpp
+++ b/Minecraft.Client/PS3/PS3_App.cpp
@@ -1,19 +1,19 @@
 
 #include "stdafx.h"
-#include <Common/Consoles_App.h>
-#include <User.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/LevelType.h>
-#include <PS3/Network/SonyCommerce_PS3.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <PS3Extras/ShutdownManager.h>
-#include <PS3/Network/SonyRemoteStorage_PS3.h>
+#include "..\Common\Consoles_App.h"
+#include "..\User.h"
+#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\Minecraft.Client\MinecraftServer.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\Minecraft.World\LevelType.h"
+#include "..\..\PS3\Network\SonyCommerce_PS3.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "PS3Extras\ShutdownManager.h"
+#include "PS3\Network\SonyRemoteStorage_PS3.h"
 
 
 
diff --git a/Minecraft.Client/PS3/PS3_App.h b/Minecraft.Client/PS3/PS3_App.h
index 64bf36365..d1ecdb6f5 100644
--- a/Minecraft.Client/PS3/PS3_App.h
+++ b/Minecraft.Client/PS3/PS3_App.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Common/Network/Sony/SonyCommerce.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "..\..\Common\Network\Sony\SonyCommerce.h"
+#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/PS3/PS3_Minecraft.cpp b/Minecraft.Client/PS3/PS3_Minecraft.cpp
index 30cc75a11..821a47d95 100644
--- a/Minecraft.Client/PS3/PS3_Minecraft.cpp
+++ b/Minecraft.Client/PS3/PS3_Minecraft.cpp
@@ -17,13 +17,13 @@ SYS_PROCESS_PARAM(1001, 0x10000);  // thread priority, and stack size
 #include <sysutil/sysutil_gamecontent.h>
 //#include <sysutil/sysutil_screenshot.h>
 
-#include <Leaderboards/PS3LeaderboardManager.h>
-#include <PS3/PS3Extras/PS3Strings.h>
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "Leaderboards\PS3LeaderboardManager.h"
+#include "PS3\PS3Extras\PS3Strings.h"
+#include "PS3\PS3Extras\ShutdownManager.h"
 #include <sysutil/sysutil_bgmplayback.h>
 #include <sysutil/sysutil_msgdialog.h>
 
-#include <PS3/Network/SonyRemoteStorage_PS3.h>
+#include "PS3/Network/SonyRemoteStorage_PS3.h"
 
 // define to use spurs (otherwise SPU threads or raw will be used)
 #define USE_SPURS
@@ -54,48 +54,48 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] =
 // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign  --wrap _malloc_init 
 
 #if HEAPINSPECTOR_PS3
-#include <HeapInspector/Server/HeapInspectorServer.h>
-#include <HeapInspector/Server/PS3/HeapHooks.hpp>
+#include "HeapInspector\Server\HeapInspectorServer.h"
+#include "HeapInspector\Server\PS3\HeapHooks.hpp"
 #endif
 
 #include "PS3_App.h"
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-//#include <Social/SocialManager.h>
-//#include <Leaderboards/LeaderboardManager.h>
-//#include <XUI/XUI_Scene_Container.h>
-//#include <NetworkManager.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Common/Console_Awards_enum.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+//#include "Social\SocialManager.h"
+//#include "Leaderboards\LeaderboardManager.h"
+//#include "XUI\XUI_Scene_Container.h"
+//#include "NetworkManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\Common\Console_Awards_enum.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
 #include "Resource.h"
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <PS3/PS3Extras/EdgeZLib.h>
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
+#include "PS3\PS3Extras\EdgeZLib.h"
 #include "C4JThread_SPU.h"
-#include <Common/Network/Sony/SQRNetworkManager.h>
-#include <Common/UI/IUIScene_PauseMenu.h>
+#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "Common\UI\IUIScene_PauseMenu.h"
 
 #include <cell/sysmodule.h>
 
diff --git a/Minecraft.Client/PS3/PS3_PlayerUID.cpp b/Minecraft.Client/PS3/PS3_PlayerUID.cpp
index 81d914d7c..8256ac21b 100644
--- a/Minecraft.Client/PS3/PS3_PlayerUID.cpp
+++ b/Minecraft.Client/PS3/PS3_PlayerUID.cpp
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 #include "PS3_PlayerUID.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 std::size_t PlayerUID::Hash::operator()(const PlayerUID& k) const
 {
diff --git a/Minecraft.Client/PS3/PS3_UIController.cpp b/Minecraft.Client/PS3/PS3_UIController.cpp
index e3c1f9600..7b634e3b0 100644
--- a/Minecraft.Client/PS3/PS3_UIController.cpp
+++ b/Minecraft.Client/PS3/PS3_UIController.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "PS3_UIController.h"
-#include <Common/UI/UIController.h>
+#include "Common/UI/UIController.h"
 #include <cell/gcm.h>
 
 // Temp
-#include <Minecraft.h>
-#include <Textures.h>
+#include "..\Minecraft.h"
+#include "..\Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/PS3/PS3_UIController.h b/Minecraft.Client/PS3/PS3_UIController.h
index 96edb383b..0077b8cf4 100644
--- a/Minecraft.Client/PS3/PS3_UIController.h
+++ b/Minecraft.Client/PS3/PS3_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIController.h>
+#include "..\Common\UI\UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
index 5ea875575..1cb5e2eec 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #ifdef __PS3__
 #ifndef SN_TARGET_PS3_SPU
-// 	#include <stdafx.h>
+// 	#include "..\..\..\stdafx.h"
 #endif
 #endif 
 
@@ -10,24 +10,24 @@
 
 
 #ifndef SN_TARGET_PS3_SPU
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/Dimension.h>
+#include "..\..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\..\Minecraft.World\Level.h"
+#include "..\..\..\..\Minecraft.World\Dimension.h"
 // 
-// #include <Chunk.h>
-// #include <TileRenderer.h>
-// #include <TileEntityRenderDispatcher.h>
-// #include <LevelRenderer.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/Icon.h>
-#include <Minecraft.World/BiomeSource.h>
+// #include "..\..\..\Chunk.h"
+// #include "..\..\..\TileRenderer.h"
+// #include "..\..\..\TileEntityRenderDispatcher.h"
+// #include "..\..\..\LevelRenderer.h"
+#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\..\..\..\Minecraft.World\Icon.h"
+#include "..\..\..\..\Minecraft.World\BiomeSource.h"
 
 #else
  
-#include <Common/spu_assert.h>
+#include "..\Common\spu_assert.h"
 
 #endif //SN_TARGET_PS3_SPU
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
index cf95682dc..c733a9285 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
@@ -1,13 +1,13 @@
 
 #pragma once
 #ifndef SN_TARGET_PS3_SPU
-#include <stdafx.h>
-#include <Minecraft.World/Region.h>
-#include <Tesselator.h>
-#include <Minecraft.World/LightLayer.h>
+#include "..\..\..\stdafx.h"
+#include "..\..\..\..\Minecraft.World\Region.h"
+#include "..\..\..\Tesselator.h"
+#include "..\..\..\..\Minecraft.World\LightLayer.h"
 #endif // SN_TARGET_PS3_SPU
 
-#include <Minecraft.World/LightLayer.h>
+#include "..\..\..\..\Minecraft.World\LightLayer.h"
 #include "Tile_SPU.h"
 #include "Tesselator_SPU.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp
index 520102b31..833025ad0 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "GrassTile_SPU.h"
-// #include <net.minecraft.world.level.h>
-// #include <net.minecraft.world.level.biome.h>
-// #include <net.minecraft.h>
-// #include <net.minecraft.world.h>
+// #include "net.minecraft.world.level.h"
+// #include "net.minecraft.world.level.biome.h"
+// #include "net.minecraft.h"
+// #include "net.minecraft.world.h"
 
 #include "Facing_SPU.h"
 #include "ChunkRebuildData.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
index a55a383e2..7f13fd4f9 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
@@ -4,7 +4,7 @@
 #include "ChunkRebuildData.h"
 
 #ifdef SN_TARGET_PS3_SPU
-#include <Common/spu_assert.h>
+#include "..\Common\spu_assert.h"
 #endif
 
 // const wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava";
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
index 15687bf50..3d1007af1 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
@@ -9,16 +9,16 @@
 #include <cell/spurs.h>
 #include <cell/dma.h>
 #include <math.h>
-#include <Common/spu_assert.h>
+#include "..\Common\spu_assert.h"
 #endif // SN_TARGET_PS3_SPU
 
 #include "Tesselator_SPU.h"
 
 static const bool sc_verbose = false;
-// #include <Minecraft.World/BasicTypeContainers.h>
-// #include <Minecraft.World/FloatBuffer.h>
-// #include <Minecraft.World/IntBuffer.h>
-// #include <Minecraft.World/ByteBuffer.h>
+// #include "..\Minecraft.World\BasicTypeContainers.h"
+// #include "..\Minecraft.World\FloatBuffer.h"
+// #include "..\Minecraft.World\IntBuffer.h"
+// #include "..\Minecraft.World\ByteBuffer.h"
 
 #ifdef SN_TARGET_PS3_SPU
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
index b21c2db7c..66e8424ea 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
@@ -6,7 +6,7 @@ typedef unsigned int DWORD;
 typedef unsigned char byte;
 #include <float.h>
 #else 
-#include <stdafx.h>
+#include "..\..\..\stdafx.h"
 class ChunkRebuildData;
 #endif
 #endif
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
index 6afb12aa6..ab9b2c94c 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
@@ -25,20 +25,20 @@
 #include <assert.h>
 
 #ifdef SN_TARGET_PS3_SPU
-#include <Common/spu_assert.h>
+#include "..\Common\spu_assert.h"
 #endif 
 
 static const float MATH_PI = 3.141592654f;
 
-// #include <GameRenderer.h>
-// #include <Minecraft.h>
-// #include <Textures.h>
-// #include <Minecraft.World/net.minecraft.world.level.h>
-//  #include <Minecraft.World/net.minecraft.world.level.tile.h>
-// #include <Minecraft.World/net.minecraft.world.level.material.h>
-// #include <Minecraft.World/net.minecraft.h>
-// #include <Minecraft.World/net.minecraft.world.h>
-//  #include <Minecraft.World/net.minecraft.world.level.tile.h>
+// #include "GameRenderer.h"
+// #include "Minecraft.h"
+// #include "Textures.h"
+// #include "..\Minecraft.World\net.minecraft.world.level.h"
+//  #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+// #include "..\Minecraft.World\net.minecraft.world.level.material.h"
+// #include "..\Minecraft.World\net.minecraft.h"
+// #include "..\Minecraft.World\net.minecraft.world.h"
+//  #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 #include "Tesselator_SPU.h"
 
@@ -46,11 +46,11 @@ static const float MATH_PI = 3.141592654f;
 #include "Stubs_SPU.h"
 #endif // SN_TARGET_PS3_SPU
 
-// #include <Minecraft.World/SharedConstants.h>
+// #include "..\..\Minecraft.World\SharedConstants.h"
 #include "Facing_SPU.h"
 
-// #include <EntityTileRenderer.h>
-// #include <Options.h>
+// #include "EntityTileRenderer.h"
+// #include "Options.h"
 
 // #define DISABLE_TESS_FUNCS
 #ifdef SN_TARGET_PS3_SPU
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
index 04a502a8f..f2dfeaac7 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
@@ -85,7 +85,7 @@
 #include "WoolCarpetTile_SPU.h"
 
 #ifdef SN_TARGET_PS3_SPU
-#include <Common/spu_assert.h>
+#include "..\Common\spu_assert.h"
 #endif
 
 #include <assert.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h
index 81c6a0748..484823efa 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h
@@ -1,8 +1,8 @@
 #pragma once
-// #include <Material.h>
-// #include <Vec3.h>
-// #include <Definitions.h>
-// #include <SoundTypes.h>
+// #include "Material.h"
+// #include "Vec3.h"
+// #include "Definitions.h"
+// #include "SoundTypes.h"
 // using namespace std;
 #include "Icon_SPU.h"
 #include "Material_SPU.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
index ba3ab1748..24dd069aa 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 
 #include "ChunkRebuildData.h"
 #include "TileRenderer_SPU.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 
 // #define SPU_HEAPSIZE (0*1024)
 // #define SPU_STACKSIZE (64*1024)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
index 99e28c9fa..dc134ecaf 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "CompressedTileStorage_SPU.h"
 #ifdef SN_TARGET_PS3_SPU
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #else
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/TilePos.h>
-#include <Minecraft.World/LevelChunk.h>
+#include "..\..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\..\Minecraft.World\TilePos.h"
+#include "..\..\..\..\Minecraft.World\LevelChunk.h"
 #endif
 
 #include <stdlib.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
index 9072c427d..51937a873 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
@@ -6,11 +6,11 @@
 #include "SparseDataStorage_SPU.h"
 
 #ifndef SN_TARGET_PS3_SPU
-#include <stdafx.h>
-#include <Minecraft.World/Region.h>
+#include "..\..\..\stdafx.h"
+#include "..\..\..\..\Minecraft.World\Region.h"
 #endif // SN_TARGET_PS3_SPU
 
-//#include <xmcore.h>
+//#include "xmcore.h"
 
 // This class is used for the compressed storage of tile data. Unlike the SparseLightingStorage class, data is split into 512 blocks of 4x4x4 tiles. Then within each block, the
 // data is compressed as described below, with a selection of bits per tile available, in a method similar to a palettised image.
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
index 2a152cc56..b25e04e0a 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "CompressedTileStorage_SPU.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 
 // #define SPU_HEAPSIZE (128*1024)
 // #define SPU_STACKSIZE (16*1024)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
index 6a1835412..7a05169a9 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 
 #include "CompressedTileStorage_compress.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
index 57c347f7a..fa52c3e19 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 
 #include "CompressedTileStorage_getData.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
index ffc714482..7199b8fc1 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 
 #include "GameRenderer_updateLightTexture.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
index 7d36aa3a2..11c3604f8 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
@@ -15,7 +15,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/gcm_spu.h>
 
 
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include "LevelRenderChunks.h"
 #include <cell/gcm_spu.h>
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
index d0824abdc..0912e33ae 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_FindNearestChunk.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
index 070340650..f2a7bca0f 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_cull.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h
index 725d7389b..485f63efe 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <vectormath/cpp/vectormath_aos.h>
+#include <vectormath\cpp\vectormath_aos.h>
 class ClipChunk_SPU
 {
 public:
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
index c1e4e9fb1..0c56bd3e0 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_zSort.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h
index f7fb5ade7..fd79a145e 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.h
@@ -1,4 +1,4 @@
 #pragma once
-#include <vectormath/cpp/vectormath_aos.h>
+#include <vectormath\cpp\vectormath_aos.h>
 
-#include <LevelRenderer_cull/LevelRenderer_cull.h>
+#include "../LevelRenderer_cull/LevelRenderer_cull.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/ImprovedNoise_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/ImprovedNoise_SPU.h
index d605c757a..a59a162d8 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/ImprovedNoise_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/ImprovedNoise_SPU.h
@@ -1,5 +1,5 @@
 #pragma once
-// #include <Synth.h>
+// #include "Synth.h"
 
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
index b3d5dc59c..755c30d09 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "PerlinNoiseJob.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h
index 4b534a8b5..b45763a55 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <vectormath/cpp/vectormath_aos.h>
+#include <vectormath\cpp\vectormath_aos.h>
 #include "PerlinNoise_SPU.h"
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
index d18214f8b..fc5322b13 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
@@ -2,7 +2,7 @@
 
 
 #include "PerlinNoise_SPU.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <alloca.h>
 
 int64_t lfloor(double v)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.h
index 5c610c008..e1017615e 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <vectormath/cpp/vectormath_aos.h>
+#include <vectormath\cpp\vectormath_aos.h>
 #include "ImprovedNoise_SPU.h"
 
 #ifndef SN_TARGET_PS3_SPU
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
index c982d543b..63259d33e 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.h b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.h
index ed0fb8f26..89763572e 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <vectormath/cpp/vectormath_aos.h>
+#include <vectormath\cpp\vectormath_aos.h>
 
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
index 8516f573b..be3ebf149 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
@@ -1,11 +1,11 @@
 include "stdafx.h"
 #include "CompressedTileStorage_SPU.h"
 #ifdef SN_TARGET_PS3_SPU
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #else
-#include <Minecraft.World/Tile.h>
-#include <Minecraft.World/TilePos.h>
-#include <Minecraft.World/LevelChunk.h>
+#include "..\..\..\..\Minecraft.World\Tile.h"
+#include "..\..\..\..\Minecraft.World\TilePos.h"
+#include "..\..\..\..\Minecraft.World\LevelChunk.h"
 #endif
 
 #include <stdlib.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
index 08bae1183..46876c53d 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
@@ -4,11 +4,11 @@
 
 
 #ifndef SN_TARGET_PS3_SPU
-#include <stdafx.h>
-#include <Minecraft.World/Region.h>
+#include "..\..\..\stdafx.h"
+#include "..\..\..\..\Minecraft.World\Region.h"
 #endif // SN_TARGET_PS3_SPU
 
-//#include <xmcore.h>
+//#include "xmcore.h"
 
 // This class is used for the compressed storage of tile data. Unlike the SparseLightingStorage class, data is split into 512 blocks of 4x4x4 tiles. Then within each block, the
 // data is compressed as described below, with a selection of bits per tile available, in a method similar to a palettised image.
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
index 44035f655..10a9b611f 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "Renderer_TextureUpdate.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
index 4fd6af3b4..1430aa278 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "Texture_blit.h"
-#include <Common/DmaData.h>
+#include "..\Common\DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/XboxGameMode.cpp b/Minecraft.Client/PS3/XboxGameMode.cpp
index 3ebc5216f..1b55fdd9f 100644
--- a/Minecraft.Client/PS3/XboxGameMode.cpp
+++ b/Minecraft.Client/PS3/XboxGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XboxGameMode.h"
-#include <Common/Tutorial/Tutorial.h>
+#include "..\Common\Tutorial\Tutorial.h"
 
 XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/PS3/XboxGameMode.h b/Minecraft.Client/PS3/XboxGameMode.h
index 9c8fd1305..347cdf308 100644
--- a/Minecraft.Client/PS3/XboxGameMode.h
+++ b/Minecraft.Client/PS3/XboxGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Common/Tutorial/TutorialMode.h>
+#include "..\Common\Tutorial\TutorialMode.h"
 
 class XboxGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/PS3/Xbox_Minecraft.cpp
index 74f91919a..fa9a33c7a 100644
--- a/Minecraft.Client/PS3/Xbox_Minecraft.cpp
+++ b/Minecraft.Client/PS3/Xbox_Minecraft.cpp
@@ -8,35 +8,35 @@
 #include "4J_strings.h"
 #include "Minecraft_Controller_Actions.h"
 #include "Xbox_App.h"
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
 
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-//#include <Social/SocialManager.h>
-//#include <Leaderboards/LeaderboardManager.h>
-//#include <XUI/XUI_Scene_Container.h>
-//#include <QNetManager.h>
-#include <Minecraft.Client/Tesselator.h>
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+//#include "Social\SocialManager.h"
+//#include "Leaderboards\LeaderboardManager.h"
+//#include "XUI\XUI_Scene_Container.h"
+//#include "QNetManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
 #include "Xbox_Awards_enum.h"
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
 #include "Resource.h"
 
 
diff --git a/Minecraft.Client/PSVita/Iggy/include/iggy.h b/Minecraft.Client/PSVita/Iggy/include/iggy.h
index b160d53c7..56638a321 100644
--- a/Minecraft.Client/PSVita/Iggy/include/iggy.h
+++ b/Minecraft.Client/PSVita/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include <rrcore.h>   // base data types, macros
+#include "rrcore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
index e74ac1b27..958999e4b 100644
--- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
+++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
@@ -2,13 +2,13 @@
 
 #include "PSVitaLeaderboardManager.h"
 
-#include <PSVita/PSVita_App.h>
-#include <PSVita/PSVitaExtras/ShutdownManager.h>
+#include "PSVita\PSVita_App.h"
+#include "PSVita\PSVitaExtras\ShutdownManager.h"
 
-#include <Common/Consoles_App.h>
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "Common\Consoles_App.h"
+#include "Common\Network\Sony\SQRNetworkManager.h"
 
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 #include <cstdlib>
 
diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
index 8b8516760..8101aa311 100644
--- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
+++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Common/Leaderboards/SonyLeaderboardManager.h>
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\SonyLeaderboardManager.h"
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 #include "Conf.h"
 
diff --git a/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp b/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
index bcd7d779b..1c5c45e31 100644
--- a/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
+++ b/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include "PSVita_NPToolkit.h"
-#include <PSVita/PSVitaExtras/Conf.h>
-#include <PSVita/Network/SonyCommerce_Vita.h>
+#include "PSVita/PSVitaExtras/Conf.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
  
 // #define NP_TITLE_ID "CUSA00265_00"
 // #define NP_TITLE_SECRET_HEX "c37e30fa1f7fd29e3534834d62781143ae29aa7b51d02320e7aa0b45116ad600e4d309e8431bc37977d98b8db480e721876e7d736e11fd906778c0033bbb6370903477b1dc1e65106afc62007a5feee3158844d721b88c3f4bff2e56417b6910cedfdec78b130d2e0dd35a35a9e2ae31d5889f9398c1d62b52a3630bb03faa5b"
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
index 26284b2c4..9a95ee082 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SQRNetworkManager_AdHoc_Vita.h"
 #include "SonyVoiceChat_Vita.h"
-#include <Common/Network/Sony/PlatformNetworkManagerSony.h>
+#include "Common/Network/Sony/PlatformNetworkManagerSony.h"
 
 #include <np.h>
 #include <rudp.h>
@@ -11,9 +11,9 @@
 #include <pspnet_adhoc.h>
 #include <adhoc_matching.h>
 
-#include <PSVita/PSVitaExtras/Conf.h>
-#include <Common/Network/Sony/SonyHttp.h>
-#include <Minecraft.World/C4JThread.h>
+#include "PSVita\PSVitaExtras\Conf.h"
+#include "Common\Network\Sony\SonyHttp.h"
+#include "..\..\..\Minecraft.World\C4JThread.h"
 
 
 #define MATCHING_PORT						(1)
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
index 8a41744ad..c1b2d2668 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
@@ -8,7 +8,7 @@
 
 #include <unordered_map>
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 // 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
index 485c5dd4c..8182674a4 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SQRNetworkManager_Vita.h"
 #include "SonyVoiceChat_Vita.h"
-#include <Common/Network/Sony/PlatformNetworkManagerSony.h>
+#include "Common/Network/Sony/PlatformNetworkManagerSony.h"
 
 #include <np.h>
 #include <rudp.h>
@@ -9,9 +9,9 @@
 #include <libnetctl.h>
 #include <netcheck_dialog.h>
 
-#include <PSVita/PSVitaExtras/Conf.h>
-#include <Common/Network/Sony/SonyHttp.h>
-#include <Minecraft.World/C4JThread.h>
+#include "PSVita\PSVitaExtras\Conf.h"
+#include "Common\Network\Sony\SonyHttp.h"
+#include "..\..\..\Minecraft.World\C4JThread.h"
 
 // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K )
 #define SESSION_IMAGE_PATH				"app0:PSVita/session_image.png"
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
index 56107309e..0fd0b4149 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
@@ -8,7 +8,7 @@
 
 #include <unordered_map>
 
-#include <Common/Network/Sony/SQRNetworkManager.h>
+#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
index ceac8571b..6285832cd 100644
--- a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/Sony/SonyCommerce.h>
+#include "Common\Network\Sony\SonyCommerce.h"
 #include <np_toolkit.h>
 #include <libsysmodule.h>
 #include <netcheck_dialog.h>
diff --git a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.cpp b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.cpp
index e081e4de8..c103b32fd 100644
--- a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.cpp
+++ b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.cpp
@@ -14,7 +14,7 @@
 // #include <sysutil/sysutil_common.h>
 // #include <sys/timer.h>
 // #include <sys/paths.h>
-// #include <sysutil/sysutil_savedata.h>
+// #include <sysutil\sysutil_savedata.h>
 
 
 
diff --git a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
index dc96a14df..13b37e3ed 100644
--- a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "Common\Network\Sony\SonyRemoteStorage.h"
 
 class SonyRemoteStorage_Vita : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/PSVita/Network/SonyVoiceChat_Vita.h b/Minecraft.Client/PSVita/Network/SonyVoiceChat_Vita.h
index 36565ccd9..6ece603f7 100644
--- a/Minecraft.Client/PSVita/Network/SonyVoiceChat_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SonyVoiceChat_Vita.h
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <voice.h>
-#include <Common/Network/Sony/SQRNetworkPlayer.h>
+#include "Common/Network/Sony/SQRNetworkPlayer.h"
 
 static const int sc_maxVoiceDataSize = 2048;
 
diff --git a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h
index f3e83e1fa..005d7b6ee 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h
+++ b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h
@@ -6,7 +6,7 @@
 // causing huge stalls.
 // This isn't really a univeral replacement for std::unordered_map and is quite specific to MobSpawner.h
 
-#include <Minecraft.World/ChunkPos.h>
+#include "../../../Minecraft.World/ChunkPos.h"
 
 typedef struct SCustomMapNode
 {
diff --git a/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h b/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h
index 212cd3c08..46f962761 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h
+++ b/Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h
@@ -6,7 +6,7 @@
 // causing huge stalls.
 // This isn't really a univeral replacement for std::unordered_set and is quite specific to Level.h
 
-#include <Minecraft.World/ChunkPos.h>
+#include "../../../Minecraft.World/ChunkPos.h"
 
 typedef struct SCustomSetNode
 {
diff --git a/Minecraft.Client/PSVita/PSVitaExtras/PSVitaTypes.h b/Minecraft.Client/PSVita/PSVitaExtras/PSVitaTypes.h
index 04c25c47a..cc2ddddbd 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/PSVitaTypes.h
+++ b/Minecraft.Client/PSVita/PSVitaExtras/PSVitaTypes.h
@@ -1,6 +1,6 @@
 #pragma once
 
-//#include <winerror.h>
+//#include "winerror.h"
 
 typedef unsigned int       DWORD;
 typedef int                 BOOL;
diff --git a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
index 0c22c42e0..e7eca53f4 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
+++ b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ShutdownManager.h"
-#include <Common/Leaderboards/LeaderboardManager.h>
-#include <MinecraftServer.h>
+#include "..\..\Common\Leaderboards\LeaderboardManager.h"
+#include "..\..\MinecraftServer.h"
 #ifdef __PS3__
 #include "C4JSpursJob.h"
 
diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp
index 50f764713..48aa25c47 100644
--- a/Minecraft.Client/PSVita/PSVita_App.cpp
+++ b/Minecraft.Client/PSVita/PSVita_App.cpp
@@ -1,24 +1,24 @@
 
 #include "stdafx.h"
-#include <Common/Consoles_App.h>
-#include <User.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/LevelType.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <PSVita/Network/SonyRemoteStorage_Vita.h>
-#include <PSVita/Network/SonyCommerce_Vita.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
-#include <PSVita/Network/PSVita_NPToolkit.h>
+#include "..\Common\Consoles_App.h"
+#include "..\User.h"
+#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\Minecraft.Client\MinecraftServer.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\Minecraft.World\LevelType.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "PSVita\Network\SonyRemoteStorage_Vita.h"
+#include "PSVita\Network\SonyCommerce_Vita.h"
+#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "PSVita/Network/PSVita_NPToolkit.h"
 #include <message_dialog.h>
 #include <savedata_dialog.h>
-#include <Common/UI/UI.h>
-#include <PSVita/PSVitaExtras/PSVitaStrings.h>
+#include "Common\UI\UI.h"
+#include "PSVita\PSVitaExtras\PSVitaStrings.h"
 
 #define VITA_COMMERCE_ENABLED
 CConsoleMinecraftApp app;
diff --git a/Minecraft.Client/PSVita/PSVita_App.h b/Minecraft.Client/PSVita/PSVita_App.h
index 12af72058..209fb91a0 100644
--- a/Minecraft.Client/PSVita/PSVita_App.h
+++ b/Minecraft.Client/PSVita/PSVita_App.h
@@ -3,8 +3,8 @@
 class C4JStringTable;
 //#include <np_toolkit.h>
 
-#include <Common/Network/Sony/SonyCommerce.h>
-#include <Common/Network/Sony/SonyRemoteStorage.h>
+#include "..\..\Common\Network\Sony\SonyCommerce.h"
+#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
index 09e4c791b..a82adf00f 100644
--- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
@@ -3,63 +3,63 @@
 
 #include "stdafx.h"
 
-#include <Leaderboards/PSVitaLeaderboardManager.h>
-#include <PSVita/PSVitaExtras/ShutdownManager.h>
+#include "Leaderboards\PSVitaLeaderboardManager.h"
+#include "PSVita\PSVitaExtras\ShutdownManager.h"
 
 //#define HEAPINSPECTOR_PS3	1
 // when defining HEAPINSPECTOR_PS3, add this line to the linker settings
 // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign  --wrap _malloc_init 
 
 #if HEAPINSPECTOR_PS3
-#include <HeapInspector/Server/HeapInspectorServer.h>
-#include <HeapInspector/Server/PS3/HeapHooks.hpp>
+#include "HeapInspector\Server\HeapInspectorServer.h"
+#include "HeapInspector\Server\PS3\HeapHooks.hpp"
 #endif
 
 //#define DISABLE_MILES_SOUND
 
 #include "PSVita_App.h"
-#include <PSVitaExtras/PSVitaStrings.h>
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "PSVitaExtras\PSVitaStrings.h"
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-//#include <Social/SocialManager.h>
-//#include <Leaderboards/LeaderboardManager.h>
-//#include <XUI/XUI_Scene_Container.h>
-//#include <NetworkManager.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Common/Console_Awards_enum.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
-//#include <Resource.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-//#include <PS3/PS3Extras/EdgeZLib.h>
-#include <Minecraft.World/C4JThread.h>
-#include <Common/Network/Sony/SQRNetworkManager.h>
-#include <Common/UI/IUIScene_PauseMenu.h>
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+//#include "Social\SocialManager.h"
+//#include "Leaderboards\LeaderboardManager.h"
+//#include "XUI\XUI_Scene_Container.h"
+//#include "NetworkManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\Common\Console_Awards_enum.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
+//#include "Resource.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
+//#include "PS3\PS3Extras\EdgeZLib.h"
+#include "..\..\Minecraft.World\C4JThread.h"
+#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "Common\UI\IUIScene_PauseMenu.h"
 #include "Conf.h"
-#include <PSVita/Network/PSVita_NPToolkit.h>
-#include <PSVita/Network/SonyVoiceChat_Vita.h>
-#include <Minecraft.World/FireworksRecipe.h>
+#include "PSVita/Network/PSVita_NPToolkit.h"
+#include "PSVita\Network\SonyVoiceChat_Vita.h"
+#include "..\..\Minecraft.World\FireworksRecipe.h"
 
 #include <libsysmodule.h>
 #include <libperf.h>
diff --git a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
index 8522c2480..a678d0a07 100644
--- a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
+++ b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PSVita_PlayerUID.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 // taken from Boost, there is no TR1 equivalent
 template <class T>
diff --git a/Minecraft.Client/PSVita/PSVita_UIController.cpp b/Minecraft.Client/PSVita/PSVita_UIController.cpp
index 931ce4363..c3a03acea 100644
--- a/Minecraft.Client/PSVita/PSVita_UIController.cpp
+++ b/Minecraft.Client/PSVita/PSVita_UIController.cpp
@@ -2,8 +2,8 @@
 #include "PSVita_UIController.h"
 
 // Temp
-#include <Minecraft.h>
-#include <Textures.h>
+#include "..\Minecraft.h"
+#include "..\Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/PSVita/PSVita_UIController.h b/Minecraft.Client/PSVita/PSVita_UIController.h
index 1411e5cc9..0d1e934f6 100644
--- a/Minecraft.Client/PSVita/PSVita_UIController.h
+++ b/Minecraft.Client/PSVita/PSVita_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIController.h>
+#include "..\Common\UI\UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp
index 3e2bfdecc..f5e09dbd2 100644
--- a/Minecraft.Client/PaintingRenderer.cpp
+++ b/Minecraft.Client/PaintingRenderer.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "PaintingRenderer.h"
-#include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/Mth.h>
+#include "entityRenderDispatcher.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\Mth.h"
 
 ResourceLocation PaintingRenderer::PAINTING_LOCATION(TN_ART_KZ);
 
diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp
index b9a3d7895..1091a26aa 100644
--- a/Minecraft.Client/Particle.cpp
+++ b/Minecraft.Client/Particle.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Particle.h"
 #include "Tesselator.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 /*
     protected int tex;
diff --git a/Minecraft.Client/Particle.h b/Minecraft.Client/Particle.h
index 19261690b..d9b0ba3a1 100644
--- a/Minecraft.Client/Particle.h
+++ b/Minecraft.Client/Particle.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/ParticleTypes.h>
+#include "..\Minecraft.World\Entity.h"
+#include "..\Minecraft.World\ParticleTypes.h"
 #include "ParticleEngine.h"
 class Tesselator;
 class CompoundTag;
diff --git a/Minecraft.Client/ParticleEngine.cpp b/Minecraft.Client/ParticleEngine.cpp
index c55e15ac3..a6f65fa6e 100644
--- a/Minecraft.Client/ParticleEngine.cpp
+++ b/Minecraft.Client/ParticleEngine.cpp
@@ -7,11 +7,11 @@
 #include "TerrainParticle.h"
 #include "ResourceLocation.h"
 #include "Camera.h"
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
 
 ResourceLocation ParticleEngine::PARTICLES_LOCATION = ResourceLocation(TN_PARTICLES);
 
diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp
index 87e052170..18d066b5a 100644
--- a/Minecraft.Client/PauseScreen.cpp
+++ b/Minecraft.Client/PauseScreen.cpp
@@ -5,10 +5,10 @@
 #include "OptionsScreen.h"
 #include "TitleScreen.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.Client/LocalPlayer.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.Client\LocalPlayer.h"
 
 PauseScreen::PauseScreen()
 {
diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp
index 94af0c01f..1c37d41f7 100644
--- a/Minecraft.Client/PendingConnection.cpp
+++ b/Minecraft.Client/PendingConnection.cpp
@@ -7,15 +7,15 @@
 #include "ServerLevel.h"
 #include "PlayerList.h"
 #include "MinecraftServer.h"
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/SharedConstants.h>
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\pos.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\SharedConstants.h"
 #include "Settings.h"
 // #ifdef __PS3__
-// #include <PS3/Network/NetworkPlayerSony.h>
+// #include "PS3\Network\NetworkPlayerSony.h"
 // #endif
 
 Random *PendingConnection::random = new Random();
@@ -258,7 +258,7 @@ void PendingConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason,
 void PendingConnection::handleGetInfo(shared_ptr<GetInfoPacket> packet)
 {
 	//try {
-	//String message = server->motd + "§" + server->players->getPlayerCount() + "§" + server->players->getMaxPlayers();
+	//String message = server->motd + "�" + server->players->getPlayerCount() + "�" + server->players->getMaxPlayers();
 	//connection->send(new DisconnectPacket(message));
 	connection->send(shared_ptr<DisconnectPacket>(new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull) ) );
 	connection->sendAndQuit();
diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h
index 8f08806fb..e8a493b09 100644
--- a/Minecraft.Client/PendingConnection.h
+++ b/Minecraft.Client/PendingConnection.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/PacketListener.h>
+#include "..\Minecraft.World\PacketListener.h"
 class MinecraftServer;
 class Socket;
 class LoginPacket;
diff --git a/Minecraft.Client/PigRenderer.cpp b/Minecraft.Client/PigRenderer.cpp
index b911e11f6..7425889dd 100644
--- a/Minecraft.Client/PigRenderer.cpp
+++ b/Minecraft.Client/PigRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PigRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation PigRenderer::PIG_LOCATION = ResourceLocation(TN_MOB_PIG);
 ResourceLocation PigRenderer::SADDLE_LOCATION = ResourceLocation(TN_MOB_SADDLE);
diff --git a/Minecraft.Client/PistonPieceRenderer.cpp b/Minecraft.Client/PistonPieceRenderer.cpp
index cf5438d23..c51d2e0f8 100644
--- a/Minecraft.Client/PistonPieceRenderer.cpp
+++ b/Minecraft.Client/PistonPieceRenderer.cpp
@@ -4,9 +4,9 @@
 #include "Tesselator.h"
 #include "TextureAtlas.h"
 #include "TileRenderer.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/PistonPieceEntity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\PistonPieceEntity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN);
 
diff --git a/Minecraft.Client/PlayerChunkMap.cpp b/Minecraft.Client/PlayerChunkMap.cpp
index a72db13f5..acf6edc3f 100644
--- a/Minecraft.Client/PlayerChunkMap.cpp
+++ b/Minecraft.Client/PlayerChunkMap.cpp
@@ -5,12 +5,12 @@
 #include "ServerChunkCache.h"
 #include "ServerPlayer.h"
 #include "MinecraftServer.h"
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/System.h>
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\ArrayWithLength.h"
+#include "..\Minecraft.World\System.h"
 #include "PlayerList.h"
 
 PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap *pcm) : pos(x,z)
diff --git a/Minecraft.Client/PlayerChunkMap.h b/Minecraft.Client/PlayerChunkMap.h
index e8e6d098d..9d1ab1b55 100644
--- a/Minecraft.Client/PlayerChunkMap.h
+++ b/Minecraft.Client/PlayerChunkMap.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/JavaIntHash.h>
-#include <Minecraft.World/ChunkPos.h>
+#include "..\Minecraft.World\JavaIntHash.h"
+#include "..\Minecraft.World\ChunkPos.h"
 class ServerPlayer;
 class ServerLevel;
 class MinecraftServer;
diff --git a/Minecraft.Client/PlayerCloudParticle.cpp b/Minecraft.Client/PlayerCloudParticle.cpp
index 2a2e4fd2d..6976fbab9 100644
--- a/Minecraft.Client/PlayerCloudParticle.cpp
+++ b/Minecraft.Client/PlayerCloudParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "PlayerCloudParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
 
 PlayerCloudParticle::PlayerCloudParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0)
 {
diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp
index 7a634ca7f..4928f65bb 100644
--- a/Minecraft.Client/PlayerConnection.cpp
+++ b/Minecraft.Client/PlayerConnection.cpp
@@ -5,32 +5,32 @@
 #include "ServerPlayerGameMode.h"
 #include "PlayerList.h"
 #include "MinecraftServer.h"
-#include <Minecraft.World/net.minecraft.commands.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/net.minecraft.world.food.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/Achievements.h>
-#include <Minecraft.World/net.minecraft.h>
+#include "..\Minecraft.World\net.minecraft.commands.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\net.minecraft.world.food.h"
+#include "..\Minecraft.World\AABB.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\Socket.h"
+#include "..\Minecraft.World\Achievements.h"
+#include "..\Minecraft.World\net.minecraft.h"
 #include "EntityTracker.h"
 #include "ServerConnection.h"
-#include <Minecraft.World/GenericStats.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\GenericStats.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 // 4J Added
-#include <Minecraft.World/net.minecraft.world.item.crafting.h>
+#include "..\Minecraft.World\net.minecraft.world.item.crafting.h"
 #include "Options.h"
 
 Random PlayerConnection::random;
diff --git a/Minecraft.Client/PlayerConnection.h b/Minecraft.Client/PlayerConnection.h
index 776138ba5..c691e6f5b 100644
--- a/Minecraft.Client/PlayerConnection.h
+++ b/Minecraft.Client/PlayerConnection.h
@@ -1,6 +1,6 @@
 #include "ConsoleInputSource.h"
-#include <Minecraft.World/PacketListener.h>
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\PacketListener.h"
+#include "..\Minecraft.World\JavaIntHash.h"
 
 class MinecraftServer;
 class Connection;
diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp
index 368695402..3cf47a1cf 100644
--- a/Minecraft.Client/PlayerList.cpp
+++ b/Minecraft.Client/PlayerList.cpp
@@ -11,24 +11,24 @@
 #include "PendingConnection.h"
 #include "PlayerConnection.h"
 #include "EntityTracker.h"
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/ProgressListener.h>
-#include <Minecraft.World/HellRandomLevelSource.h>
-#include <Minecraft.World/net.minecraft.world.phys.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/EntityIO.h>
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\ArrayWithLength.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\ProgressListener.h"
+#include "..\Minecraft.World\HellRandomLevelSource.h"
+#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\EntityIO.h"
 #if defined(_XBOX) || defined(_WINDOWS64)
-#include <Xbox/Network/NetworkPlayerXbox.h>
+#include "Xbox\Network\NetworkPlayerXbox.h"
 #elif defined(__PS3__) || defined(__ORBIS__)
-#include <Common/Network/Sony/NetworkPlayerSony.h>
+#include "Common\Network\Sony\NetworkPlayerSony.h"
 #endif
 
 // 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.
diff --git a/Minecraft.Client/PlayerList.h b/Minecraft.Client/PlayerList.h
index 7e15e7442..6a6ee94c9 100644
--- a/Minecraft.Client/PlayerList.h
+++ b/Minecraft.Client/PlayerList.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <deque>
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 
 class ServerPlayer;
 class PlayerChunkMap;
diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp
index cb73ae2c3..7d135c2bc 100644
--- a/Minecraft.Client/PlayerRenderer.cpp
+++ b/Minecraft.Client/PlayerRenderer.cpp
@@ -6,13 +6,13 @@
 #include "ModelPart.h"
 #include "LocalPlayer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "entityRenderDispatcher.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\StringHelpers.h"
 
 const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = 
 {
diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h
index 9deb1e942..25c32a308 100644
--- a/Minecraft.Client/PlayerRenderer.h
+++ b/Minecraft.Client/PlayerRenderer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "MobRenderer.h"
-#include <Minecraft.World/Player.h>
+#include "..\Minecraft.World\Player.h"
 
 class HumanoidModel;
 
diff --git a/Minecraft.Client/Polygon.h b/Minecraft.Client/Polygon.h
index 5840cb175..24cb2218e 100644
--- a/Minecraft.Client/Polygon.h
+++ b/Minecraft.Client/Polygon.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Vertex.h"
 #include "Tesselator.h"
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 
 class _Polygon
 {
diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp
index ee09449ae..5ea7bc59e 100644
--- a/Minecraft.Client/PreStitchedTextureMap.cpp
+++ b/Minecraft.Client/PreStitchedTextureMap.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/ByteBuffer.h>
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\ByteBuffer.h"
 #include "Minecraft.h"
 #include "LevelRenderer.h"
 #include "EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/PreStitchedTextureMap.h b/Minecraft.Client/PreStitchedTextureMap.h
index 7c8acf3c0..882a7eae3 100644
--- a/Minecraft.Client/PreStitchedTextureMap.h
+++ b/Minecraft.Client/PreStitchedTextureMap.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/IconRegister.h>
+#include "..\Minecraft.World\IconRegister.h"
 
 class Icon;
 class StitchedTexture;
diff --git a/Minecraft.Client/ProgressRenderer.cpp b/Minecraft.Client/ProgressRenderer.cpp
index 559c87449..a7c3fd301 100644
--- a/Minecraft.Client/ProgressRenderer.cpp
+++ b/Minecraft.Client/ProgressRenderer.cpp
@@ -2,7 +2,7 @@
 #include "Tesselator.h"
 #include "Textures.h"
 #include "ProgressRenderer.h"
-#include <Minecraft.World/System.h>
+#include "..\Minecraft.World\System.h"
 
 CRITICAL_SECTION ProgressRenderer::s_progress;
 
diff --git a/Minecraft.Client/ProgressRenderer.h b/Minecraft.Client/ProgressRenderer.h
index 4e9d7954e..29c847d06 100644
--- a/Minecraft.Client/ProgressRenderer.h
+++ b/Minecraft.Client/ProgressRenderer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/ProgressListener.h>
+#include "..\Minecraft.World\ProgressListener.h"
 
 class ProgressRenderer : public ProgressListener
 {
diff --git a/Minecraft.Client/QuadrupedModel.cpp b/Minecraft.Client/QuadrupedModel.cpp
index 674a7ac28..ea0419104 100644
--- a/Minecraft.Client/QuadrupedModel.cpp
+++ b/Minecraft.Client/QuadrupedModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "QuadrupedModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 QuadrupedModel::QuadrupedModel(int legSize, float g) : Model()
diff --git a/Minecraft.Client/ReceivingLevelScreen.cpp b/Minecraft.Client/ReceivingLevelScreen.cpp
index 3f66d2a8c..0e9fe3ec0 100644
--- a/Minecraft.Client/ReceivingLevelScreen.cpp
+++ b/Minecraft.Client/ReceivingLevelScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ReceivingLevelScreen.h"
 #include "ClientConnection.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection *connection)
 {
diff --git a/Minecraft.Client/RedDustParticle.cpp b/Minecraft.Client/RedDustParticle.cpp
index 32fa52027..6a6ad1e1b 100644
--- a/Minecraft.Client/RedDustParticle.cpp
+++ b/Minecraft.Client/RedDustParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "RedDustParticle.h"
 
 void RedDustParticle::init(Level *level, double x, double y, double z, float scale, float rCol, float gCol, float bCol)
diff --git a/Minecraft.Client/RemotePlayer.cpp b/Minecraft.Client/RemotePlayer.cpp
index 94dda18d9..bea128428 100644
--- a/Minecraft.Client/RemotePlayer.cpp
+++ b/Minecraft.Client/RemotePlayer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "RemotePlayer.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\Mth.h"
 
 RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level, name)
 {
diff --git a/Minecraft.Client/RemotePlayer.h b/Minecraft.Client/RemotePlayer.h
index 74a407666..3fab1dded 100644
--- a/Minecraft.Client/RemotePlayer.h
+++ b/Minecraft.Client/RemotePlayer.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/SmoothFloat.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
+#include "..\Minecraft.World\SmoothFloat.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
 
 class Input;
 
diff --git a/Minecraft.Client/RenameWorldScreen.cpp b/Minecraft.Client/RenameWorldScreen.cpp
index 018fec2b9..ea05039af 100644
--- a/Minecraft.Client/RenameWorldScreen.cpp
+++ b/Minecraft.Client/RenameWorldScreen.cpp
@@ -2,9 +2,9 @@
 #include "RenameWorldScreen.h"
 #include "EditBox.h"
 #include "Button.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
 
 RenameWorldScreen::RenameWorldScreen(Screen *lastScreen, const wstring& levelId)
 {
diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp
index bda5480fa..6a402b04c 100644
--- a/Minecraft.Client/Screen.cpp
+++ b/Minecraft.Client/Screen.cpp
@@ -4,9 +4,9 @@
 #include "GuiParticles.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include <Minecraft.World/SoundTypes.h>
+#include "..\Minecraft.World\SoundTypes.h"
 #ifdef _WINDOWS64
-#include <Windows64/KeyboardMouseInput.h>
+#include "Windows64\KeyboardMouseInput.h"
 #endif
 
 
diff --git a/Minecraft.Client/ScrolledSelectionList.cpp b/Minecraft.Client/ScrolledSelectionList.cpp
index 6e5e3d3d4..9b7367ce0 100644
--- a/Minecraft.Client/ScrolledSelectionList.cpp
+++ b/Minecraft.Client/ScrolledSelectionList.cpp
@@ -3,7 +3,7 @@
 #include "Button.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include <Minecraft.World/System.h>
+#include "..\Minecraft.World\System.h"
 
 ScrolledSelectionList::ScrolledSelectionList(Minecraft *minecraft, int width, int height, int y0, int y1, int itemHeight)
 {
diff --git a/Minecraft.Client/SelectWorldScreen.cpp b/Minecraft.Client/SelectWorldScreen.cpp
index 5fafc82e7..a07eb7b22 100644
--- a/Minecraft.Client/SelectWorldScreen.cpp
+++ b/Minecraft.Client/SelectWorldScreen.cpp
@@ -5,9 +5,9 @@
 #include "CreateWorldScreen.h"
 #include "RenameWorldScreen.h"
 #include "DemoMode.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
 
 
 SelectWorldScreen::SelectWorldScreen(Screen *lastScreen)
diff --git a/Minecraft.Client/ServerChunkCache.cpp b/Minecraft.Client/ServerChunkCache.cpp
index 38ec51505..619efa98e 100644
--- a/Minecraft.Client/ServerChunkCache.cpp
+++ b/Minecraft.Client/ServerChunkCache.cpp
@@ -2,16 +2,16 @@
 #include "ServerChunkCache.h"
 #include "ServerLevel.h"
 #include "MinecraftServer.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/ProgressListener.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <Minecraft.World/Tile.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\ProgressListener.h"
+#include "..\Minecraft.World\ThreadName.h"
+#include "..\Minecraft.World\compression.h"
+#include "..\Minecraft.World\OldChunkStorage.h"
+#include "..\Minecraft.World\Tile.h"
 
 ServerChunkCache::ServerChunkCache(ServerLevel *level, ChunkStorage *storage, ChunkSource *source)
 {
diff --git a/Minecraft.Client/ServerChunkCache.h b/Minecraft.Client/ServerChunkCache.h
index 0925ef500..cf93fdc55 100644
--- a/Minecraft.Client/ServerChunkCache.h
+++ b/Minecraft.Client/ServerChunkCache.h
@@ -1,10 +1,10 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/JavaIntHash.h>
-#include <Minecraft.World/RandomLevelSource.h>
-#include <Minecraft.World/C4JThread.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\JavaIntHash.h"
+#include "..\Minecraft.World\RandomLevelSource.h"
+#include "..\Minecraft.World\C4JThread.h"
 using namespace std;
 class ServerLevel;
 
diff --git a/Minecraft.Client/ServerCommandDispatcher.cpp b/Minecraft.Client/ServerCommandDispatcher.cpp
index c180dd55f..51dd42fe9 100644
--- a/Minecraft.Client/ServerCommandDispatcher.cpp
+++ b/Minecraft.Client/ServerCommandDispatcher.cpp
@@ -2,8 +2,8 @@
 #include "MinecraftServer.h"
 #include "PlayerList.h"
 #include "ServerPlayer.h"
-#include <Minecraft.World/net.minecraft.commands.h>
-#include <Minecraft.World/net.minecraft.commands.common.h>
+#include "..\Minecraft.World\net.minecraft.commands.h"
+#include "..\Minecraft.World\net.minecraft.commands.common.h"
 #include "TeleportCommand.h"
 #include "ServerCommandDispatcher.h"
 
diff --git a/Minecraft.Client/ServerCommandDispatcher.h b/Minecraft.Client/ServerCommandDispatcher.h
index 5acccf7eb..306d43842 100644
--- a/Minecraft.Client/ServerCommandDispatcher.h
+++ b/Minecraft.Client/ServerCommandDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Minecraft.World/CommandDispatcher.h>
-#include <Minecraft.World/AdminLogCommand.h>
+#include "..\Minecraft.World\CommandDispatcher.h"
+#include "..\Minecraft.World\AdminLogCommand.h"
 
 class ServerCommandDispatcher : public CommandDispatcher, public AdminLogCommand
 {
diff --git a/Minecraft.Client/ServerConnection.cpp b/Minecraft.Client/ServerConnection.cpp
index cdec3b3bd..21d77f228 100644
--- a/Minecraft.Client/ServerConnection.cpp
+++ b/Minecraft.Client/ServerConnection.cpp
@@ -4,9 +4,9 @@
 #include "PendingConnection.h"
 #include "PlayerConnection.h"
 #include "ServerPlayer.h"
-#include <Minecraft.World/net.minecraft.network.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
+#include "..\Minecraft.World\net.minecraft.network.h"
+#include "..\Minecraft.World\Socket.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
 #include "MultiPlayerLevel.h"
 
 ServerConnection::ServerConnection(MinecraftServer *server)
diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp
index 30b203ca4..8501cbf98 100644
--- a/Minecraft.Client/ServerLevel.cpp
+++ b/Minecraft.Client/ServerLevel.cpp
@@ -7,35 +7,35 @@
 #include "PlayerConnection.h"
 #include "EntityTracker.h"
 #include "ServerScoreboard.h"
-#include <Minecraft.World/ScoreboardSaveData.h>
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.ai.village.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.npc.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.biome.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.levelgen.feature.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.scores.h>
-#include <Minecraft.World/ItemEntity.h>
-#include <Minecraft.World/Arrow.h>
-#include <Minecraft.World/PrimedTnt.h>
-#include <Minecraft.World/FallingTile.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/StructurePiece.h>
-#include <Minecraft.Client/ServerLevelListener.h>
-#include <Minecraft.World/WeighedTreasure.h>
+#include "..\Minecraft.World\ScoreboardSaveData.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.ai.village.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.biome.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.level.levelgen.feature.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.scores.h"
+#include "..\Minecraft.World\ItemEntity.h"
+#include "..\Minecraft.World\Arrow.h"
+#include "..\Minecraft.World\PrimedTnt.h"
+#include "..\Minecraft.World\FallingTile.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\StructurePiece.h"
+#include "..\Minecraft.Client\ServerLevelListener.h"
+#include "..\Minecraft.World\WeighedTreasure.h"
 #include "TexturePackRepository.h"
 #include "DLCTexturePack.h"
-#include <Minecraft.World/ProgressListener.h>
-#include <PS3/PS3Extras/ShutdownManager.h>
+#include "..\Minecraft.World\ProgressListener.h"
+#include "PS3\PS3Extras\ShutdownManager.h"
 #include "PlayerChunkMap.h"
 
 WeighedTreasureArray ServerLevel::RANDOM_BONUS_ITEMS;
diff --git a/Minecraft.Client/ServerLevel.h b/Minecraft.Client/ServerLevel.h
index 8f11b9795..45f3114d5 100644
--- a/Minecraft.Client/ServerLevel.h
+++ b/Minecraft.Client/ServerLevel.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\JavaIntHash.h"
 class ServerChunkCache;
 class MinecraftServer;
 class Node;
diff --git a/Minecraft.Client/ServerLevelListener.cpp b/Minecraft.Client/ServerLevelListener.cpp
index dda6cd0cc..b95f6fa78 100644
--- a/Minecraft.Client/ServerLevelListener.cpp
+++ b/Minecraft.Client/ServerLevelListener.cpp
@@ -7,9 +7,9 @@
 #include "PlayerList.h"
 #include "PlayerChunkMap.h"
 #include "PlayerConnection.h"
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/LevelData.h>
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\LevelData.h"
 
 
 ServerLevelListener::ServerLevelListener(MinecraftServer *server, ServerLevel *level)
diff --git a/Minecraft.Client/ServerLevelListener.h b/Minecraft.Client/ServerLevelListener.h
index 703a3e99e..5265efb59 100644
--- a/Minecraft.Client/ServerLevelListener.h
+++ b/Minecraft.Client/ServerLevelListener.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/LevelListener.h>
+#include "..\Minecraft.World\LevelListener.h"
 class Player;
 class TileEntity;
 class Entity;
diff --git a/Minecraft.Client/ServerPlayer.cpp b/Minecraft.Client/ServerPlayer.cpp
index 04bee6f1b..10fde77b2 100644
--- a/Minecraft.Client/ServerPlayer.cpp
+++ b/Minecraft.Client/ServerPlayer.cpp
@@ -9,28 +9,28 @@
 #include "PlayerList.h"
 #include "MultiPlayerLevel.h"
 
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.damagesource.h>
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.item.trading.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.scores.h>
-#include <Minecraft.World/net.minecraft.world.scores.criteria.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.damagesource.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.scores.h"
+#include "..\Minecraft.World\net.minecraft.world.scores.criteria.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
-#include <Minecraft.World/Pos.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\Pos.h"
+#include "..\Minecraft.World\Random.h"
 
-#include <Minecraft.World/LevelChunk.h>
+#include "..\Minecraft.World\LevelChunk.h"
 #include "LevelRenderer.h"
 
 
diff --git a/Minecraft.Client/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h
index 20036fbb1..57ea89479 100644
--- a/Minecraft.Client/ServerPlayer.h
+++ b/Minecraft.Client/ServerPlayer.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.inventory.ContainerListener.h>
-#include <Minecraft.World/ChunkPos.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h"
+#include "..\Minecraft.World\ChunkPos.h"
 class PlayerConnection;
 class MinecraftServer;
 class ServerPlayerGameMode;
diff --git a/Minecraft.Client/ServerPlayerGameMode.cpp b/Minecraft.Client/ServerPlayerGameMode.cpp
index f37675e0b..2e6bca35e 100644
--- a/Minecraft.Client/ServerPlayerGameMode.cpp
+++ b/Minecraft.Client/ServerPlayerGameMode.cpp
@@ -3,13 +3,13 @@
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
 #include "MultiPlayerLevel.h"
 #include "LevelRenderer.h"
 
diff --git a/Minecraft.Client/ServerScoreboard.h b/Minecraft.Client/ServerScoreboard.h
index 96f0af629..6de7f88d6 100644
--- a/Minecraft.Client/ServerScoreboard.h
+++ b/Minecraft.Client/ServerScoreboard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Minecraft.World/Scoreboard.h>
+#include "..\Minecraft.World\Scoreboard.h"
 
 class MinecraftServer;
 class ScoreboardSaveData;
diff --git a/Minecraft.Client/Settings.cpp b/Minecraft.Client/Settings.cpp
index 710bc87ef..89946773b 100644
--- a/Minecraft.Client/Settings.cpp
+++ b/Minecraft.Client/Settings.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Settings.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 // 4J - TODO - serialise/deserialise from file
 Settings::Settings(File *file)
diff --git a/Minecraft.Client/SheepFurModel.cpp b/Minecraft.Client/SheepFurModel.cpp
index 76f376b08..648c56031 100644
--- a/Minecraft.Client/SheepFurModel.cpp
+++ b/Minecraft.Client/SheepFurModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "SheepFurModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/SheepModel.cpp b/Minecraft.Client/SheepModel.cpp
index f92dbd2ba..669446043 100644
--- a/Minecraft.Client/SheepModel.cpp
+++ b/Minecraft.Client/SheepModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "SheepModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/SheepRenderer.cpp b/Minecraft.Client/SheepRenderer.cpp
index 932b338dc..5a3580bce 100644
--- a/Minecraft.Client/SheepRenderer.cpp
+++ b/Minecraft.Client/SheepRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SheepRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation SheepRenderer::SHEEP_LOCATION = ResourceLocation(TN_MOB_SHEEP);
 ResourceLocation SheepRenderer::SHEEP_FUR_LOCATION = ResourceLocation(TN_MOB_SHEEP_FUR);
diff --git a/Minecraft.Client/SignRenderer.cpp b/Minecraft.Client/SignRenderer.cpp
index cc436a092..5f764a92a 100644
--- a/Minecraft.Client/SignRenderer.cpp
+++ b/Minecraft.Client/SignRenderer.cpp
@@ -2,10 +2,10 @@
 #include "SignRenderer.h"
 #include "SignModel.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/Entity.h>
-#include <Minecraft.World/Level.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\Entity.h"
+#include "..\Minecraft.World\Level.h"
 
 ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN);
 
diff --git a/Minecraft.Client/SilverfishModel.cpp b/Minecraft.Client/SilverfishModel.cpp
index 26760da6d..ce8b8254a 100644
--- a/Minecraft.Client/SilverfishModel.cpp
+++ b/Minecraft.Client/SilverfishModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SilverfishModel.h"
 #include "Cube.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = {
diff --git a/Minecraft.Client/SilverfishRenderer.cpp b/Minecraft.Client/SilverfishRenderer.cpp
index 183b26d13..a03aaef18 100644
--- a/Minecraft.Client/SilverfishRenderer.cpp
+++ b/Minecraft.Client/SilverfishRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SilverfishRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "SilverfishModel.h"
 
 ResourceLocation SilverfishRenderer::SILVERFISH_LOCATION(TN_MOB_SILVERFISH);
diff --git a/Minecraft.Client/SkeletonModel.cpp b/Minecraft.Client/SkeletonModel.cpp
index bbf08cf3c..7cdba9e25 100644
--- a/Minecraft.Client/SkeletonModel.cpp
+++ b/Minecraft.Client/SkeletonModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SkeletonModel.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "ModelPart.h"
 
 void SkeletonModel::_init(float g)
diff --git a/Minecraft.Client/SkeletonRenderer.cpp b/Minecraft.Client/SkeletonRenderer.cpp
index 6124cd789..56682ddf1 100644
--- a/Minecraft.Client/SkeletonRenderer.cpp
+++ b/Minecraft.Client/SkeletonRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SkeletonRenderer.h"
 #include "SkeletonModel.h"
-#include <Minecraft.World/Skeleton.h>
+#include "../Minecraft.World/Skeleton.h"
 
 ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON);
 ResourceLocation SkeletonRenderer::WITHER_SKELETON_LOCATION = ResourceLocation(TN_MOB_WITHER_SKELETON);
diff --git a/Minecraft.Client/SkullTileRenderer.cpp b/Minecraft.Client/SkullTileRenderer.cpp
index 66472bb9a..32d216cd6 100644
--- a/Minecraft.Client/SkullTileRenderer.cpp
+++ b/Minecraft.Client/SkullTileRenderer.cpp
@@ -2,9 +2,9 @@
 #include "SkullTileRenderer.h"
 #include "SkeletonHeadModel.h"
 #include "PlayerRenderer.h"
-#include <Minecraft.World/SkullTileEntity.h>
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\SkullTileEntity.h"
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 SkullTileRenderer *SkullTileRenderer::instance = NULL;
 
diff --git a/Minecraft.Client/SlimeRenderer.cpp b/Minecraft.Client/SlimeRenderer.cpp
index c14b7b97e..f3f64aed4 100644
--- a/Minecraft.Client/SlimeRenderer.cpp
+++ b/Minecraft.Client/SlimeRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SlimeRenderer.h"	
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 
 ResourceLocation SlimeRenderer::SLIME_LOCATION = ResourceLocation(TN_MOB_SLIME);
 
diff --git a/Minecraft.Client/SmokeParticle.cpp b/Minecraft.Client/SmokeParticle.cpp
index 79d6f0d8c..a88558851 100644
--- a/Minecraft.Client/SmokeParticle.cpp
+++ b/Minecraft.Client/SmokeParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "SmokeParticle.h"
 
 void SmokeParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/SnowManModel.cpp b/Minecraft.Client/SnowManModel.cpp
index 5252b2922..eadbf367d 100644
--- a/Minecraft.Client/SnowManModel.cpp
+++ b/Minecraft.Client/SnowManModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "SnowManModel.h"
-#include <Minecraft.World/Mth.h>
+#include "SnowmanModel.h"
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 SnowManModel::SnowManModel() : Model()
diff --git a/Minecraft.Client/SnowManRenderer.cpp b/Minecraft.Client/SnowManRenderer.cpp
index e6dcb22b9..1e258f3c6 100644
--- a/Minecraft.Client/SnowManRenderer.cpp
+++ b/Minecraft.Client/SnowManRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "SnowManModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "ModelPart.h"
 #include "EntityRenderDispatcher.h"
 #include "SnowManRenderer.h"
diff --git a/Minecraft.Client/SnowShovelParticle.cpp b/Minecraft.Client/SnowShovelParticle.cpp
index f6000fe61..4417cb5d8 100644
--- a/Minecraft.Client/SnowShovelParticle.cpp
+++ b/Minecraft.Client/SnowShovelParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "SnowShovelParticle.h"
 
 void SnowShovelParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/SpellParticle.cpp b/Minecraft.Client/SpellParticle.cpp
index d4b1b9d51..ce8b975f1 100644
--- a/Minecraft.Client/SpellParticle.cpp
+++ b/Minecraft.Client/SpellParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\JavaMath.h"
 #include "SpellParticle.h"
 
 SpellParticle::SpellParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
diff --git a/Minecraft.Client/SpiderModel.cpp b/Minecraft.Client/SpiderModel.cpp
index 2eb7344a3..739677e43 100644
--- a/Minecraft.Client/SpiderModel.cpp
+++ b/Minecraft.Client/SpiderModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SpiderModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 SpiderModel::SpiderModel() : Model()
diff --git a/Minecraft.Client/SpiderRenderer.cpp b/Minecraft.Client/SpiderRenderer.cpp
index 8898c4c97..617cce900 100644
--- a/Minecraft.Client/SpiderRenderer.cpp
+++ b/Minecraft.Client/SpiderRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SpiderRenderer.h"
 #include "SpiderModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 
 ResourceLocation SpiderRenderer::SPIDER_LOCATION = ResourceLocation(TN_MOB_SPIDER);
 ResourceLocation SpiderRenderer::SPIDER_EYES_LOCATION = ResourceLocation(TN_MOB_SPIDER_EYES);
diff --git a/Minecraft.Client/SquidModel.cpp b/Minecraft.Client/SquidModel.cpp
index 73b178c29..0152418f2 100644
--- a/Minecraft.Client/SquidModel.cpp
+++ b/Minecraft.Client/SquidModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SquidModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 SquidModel::SquidModel() : Model()
diff --git a/Minecraft.Client/SquidRenderer.cpp b/Minecraft.Client/SquidRenderer.cpp
index 0fd4f603e..75d14f4e5 100644
--- a/Minecraft.Client/SquidRenderer.cpp
+++ b/Minecraft.Client/SquidRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SquidRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation SquidRenderer::SQUID_LOCATION = ResourceLocation(TN_MOB_SQUID);
 
diff --git a/Minecraft.Client/StatsCounter.cpp b/Minecraft.Client/StatsCounter.cpp
index 66d9138ff..b75625e9d 100644
--- a/Minecraft.Client/StatsCounter.cpp
+++ b/Minecraft.Client/StatsCounter.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "StatsCounter.h"
-#include <Minecraft.World/Stat.h>
-#include <Minecraft.World/Stats.h>
-#include <Minecraft.World/Achievement.h>
-#include <Minecraft.World/Achievements.h>
-#include <Minecraft.Client/LocalPlayer.h>
+#include "..\Minecraft.World\Stat.h"
+#include "..\Minecraft.World\Stats.h"
+#include "..\Minecraft.World\Achievement.h"
+#include "..\Minecraft.World\Achievements.h"
+#include "..\Minecraft.Client\LocalPlayer.h"
 
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 
-#include <Minecraft.Client/Common/Leaderboards/LeaderboardManager.h>
+#include "..\Minecraft.Client\Common\Leaderboards\LeaderboardManager.h"
 
 Stat** StatsCounter::LARGE_STATS[] = {
 	&Stats::walkOneM,
diff --git a/Minecraft.Client/StatsScreen.cpp b/Minecraft.Client/StatsScreen.cpp
index 617083f97..01d041f0e 100644
--- a/Minecraft.Client/StatsScreen.cpp
+++ b/Minecraft.Client/StatsScreen.cpp
@@ -5,9 +5,9 @@
 #include "Button.h"
 #include "Font.h"
 #include "Lighting.h"
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/net.minecraft.stats.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 
 const float StatsScreen::SLOT_TEX_SIZE = 128.0f;
 ItemRenderer *StatsScreen::itemRenderer = NULL;
diff --git a/Minecraft.Client/StitchSlot.cpp b/Minecraft.Client/StitchSlot.cpp
index dfba9d765..5e9700b08 100644
--- a/Minecraft.Client/StitchSlot.cpp
+++ b/Minecraft.Client/StitchSlot.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TextureHolder.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "StitchSlot.h"
 
 StitchSlot::StitchSlot(int originX, int originY, int width, int height) : originX(originX), originY(originY), width(width), height(height)
diff --git a/Minecraft.Client/StitchedTexture.cpp b/Minecraft.Client/StitchedTexture.cpp
index b06982eae..c17f3db5e 100644
--- a/Minecraft.Client/StitchedTexture.cpp
+++ b/Minecraft.Client/StitchedTexture.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Texture.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "ClockTexture.h"
 #include "CompassTexture.h"
 #include "StitchedTexture.h"
diff --git a/Minecraft.Client/StitchedTexture.h b/Minecraft.Client/StitchedTexture.h
index 7b8fac5e6..0ac37b2da 100644
--- a/Minecraft.Client/StitchedTexture.h
+++ b/Minecraft.Client/StitchedTexture.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/Icon.h>
+#include "..\Minecraft.World\Icon.h"
 class Texture;
 
 class StitchedTexture : public Icon
diff --git a/Minecraft.Client/SurvivalMode.cpp b/Minecraft.Client/SurvivalMode.cpp
index 2c67faf92..27a992df0 100644
--- a/Minecraft.Client/SurvivalMode.cpp
+++ b/Minecraft.Client/SurvivalMode.cpp
@@ -3,10 +3,10 @@
 #include "DemoMode.h"
 #include "LevelRenderer.h"
 #include "LocalPlayer.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "ClientConstants.h"
 
 SurvivalMode::SurvivalMode(Minecraft *minecraft) : GameMode(minecraft)
diff --git a/Minecraft.Client/SuspendedParticle.cpp b/Minecraft.Client/SuspendedParticle.cpp
index 71e718924..70702de0f 100644
--- a/Minecraft.Client/SuspendedParticle.cpp
+++ b/Minecraft.Client/SuspendedParticle.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "SuspendedParticle.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
 
 SuspendedParticle::SuspendedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x, y - 2 / 16.0f, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/SuspendedTownParticle.cpp b/Minecraft.Client/SuspendedTownParticle.cpp
index aae6e4496..a24bbc42a 100644
--- a/Minecraft.Client/SuspendedTownParticle.cpp
+++ b/Minecraft.Client/SuspendedTownParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SuspendedTownParticle.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/JavaMath.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\JavaMath.h"
 
 SuspendedTownParticle::SuspendedTownParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/TakeAnimationParticle.cpp b/Minecraft.Client/TakeAnimationParticle.cpp
index 057a3a96b..c9530b0a0 100644
--- a/Minecraft.Client/TakeAnimationParticle.cpp
+++ b/Minecraft.Client/TakeAnimationParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "TakeAnimationParticle.h"
 #include "EntityRenderDispatcher.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\Mth.h"
 
 TakeAnimationParticle::TakeAnimationParticle(Level *level, shared_ptr<Entity> item, shared_ptr<Entity> target, float yOffs) : Particle(level, item->x, item->y, item->z, item->xd, item->yd, item->zd)
 {
diff --git a/Minecraft.Client/TeleportCommand.cpp b/Minecraft.Client/TeleportCommand.cpp
index 056f3f0ca..2132cfd4b 100644
--- a/Minecraft.Client/TeleportCommand.cpp
+++ b/Minecraft.Client/TeleportCommand.cpp
@@ -3,10 +3,10 @@
 #include "PlayerList.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include <Minecraft.World/net.minecraft.commands.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.dimension.h>
+#include "..\Minecraft.World\net.minecraft.commands.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
 #include "TeleportCommand.h"
 
 EGameCommand TeleportCommand::getId()
diff --git a/Minecraft.Client/TeleportCommand.h b/Minecraft.Client/TeleportCommand.h
index d5006ccc9..9015a52db 100644
--- a/Minecraft.Client/TeleportCommand.h
+++ b/Minecraft.Client/TeleportCommand.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Minecraft.World/Command.h>
+#include "..\Minecraft.World\Command.h"
 
 class TeleportCommand : public Command
 {
diff --git a/Minecraft.Client/TerrainParticle.cpp b/Minecraft.Client/TerrainParticle.cpp
index c81e48d98..811ba840b 100644
--- a/Minecraft.Client/TerrainParticle.cpp
+++ b/Minecraft.Client/TerrainParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "TerrainParticle.h"
 #include "Tesselator.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 TerrainParticle::TerrainParticle(Level *level, double x, double y, double z, double xa, double ya, double za, Tile *tile, int face, int data, Textures *textures) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/Tesselator.cpp b/Minecraft.Client/Tesselator.cpp
index 530b4ca00..7bae7aca9 100644
--- a/Minecraft.Client/Tesselator.cpp
+++ b/Minecraft.Client/Tesselator.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Tesselator.h"
-#include <Minecraft.World/BasicTypeContainers.h>
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/ByteBuffer.h>
+#include "..\Minecraft.World\BasicTypeContainers.h"
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\ByteBuffer.h"
 
 bool Tesselator::TRIANGLE_MODE = false;
 bool Tesselator::USE_VBO = false;
diff --git a/Minecraft.Client/TextEditScreen.cpp b/Minecraft.Client/TextEditScreen.cpp
index be8172b5f..9537b969c 100644
--- a/Minecraft.Client/TextEditScreen.cpp
+++ b/Minecraft.Client/TextEditScreen.cpp
@@ -4,11 +4,11 @@
 #include "TileEntityRenderDispatcher.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLevel.h"
-#include <Minecraft.World/SignTileEntity.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\SignTileEntity.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 
 const wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters;;
diff --git a/Minecraft.Client/Texture.cpp b/Minecraft.Client/Texture.cpp
index c4c540ff7..809f606aa 100644
--- a/Minecraft.Client/Texture.cpp
+++ b/Minecraft.Client/Texture.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include <Minecraft.World/ByteBuffer.h>
+#include "..\Minecraft.World\ByteBuffer.h"
 #include "Rect2i.h"
 #include "TextureManager.h"
 #include "Texture.h"
 
 #ifdef __PS3__
-#include <PS3/SPU_Tasks/Texture_blit/Texture_blit.h>
+#include "PS3\SPU_Tasks\Texture_blit\Texture_blit.h"
 #include "C4JSpursJob.h"
 static const int sc_maxTextureBlits = 256;
 static Texture_blit_DataIn g_textureBlitDataIn[sc_maxTextureBlits] __attribute__((__aligned__(16)));
diff --git a/Minecraft.Client/TextureHolder.cpp b/Minecraft.Client/TextureHolder.cpp
index 21c19f9b7..9cbf5c46c 100644
--- a/Minecraft.Client/TextureHolder.cpp
+++ b/Minecraft.Client/TextureHolder.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Stitcher.h"
 #include "Texture.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 #include "TextureHolder.h"
 
 TextureHolder::TextureHolder(Texture *texture)
diff --git a/Minecraft.Client/TextureManager.cpp b/Minecraft.Client/TextureManager.cpp
index cdb7232be..84b164b4c 100644
--- a/Minecraft.Client/TextureManager.cpp
+++ b/Minecraft.Client/TextureManager.cpp
@@ -5,7 +5,7 @@
 #include "TexturePackRepository.h"
 #include "Minecraft.h"
 #include "TextureManager.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\StringHelpers.h"
 
 TextureManager *TextureManager::instance = NULL;
 
diff --git a/Minecraft.Client/TextureMap.cpp b/Minecraft.Client/TextureMap.cpp
index 8a7ea04a7..836a853e5 100644
--- a/Minecraft.Client/TextureMap.cpp
+++ b/Minecraft.Client/TextureMap.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 #include "Minecraft.h"
 #include "LevelRenderer.h"
 #include "EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/TextureMap.h b/Minecraft.Client/TextureMap.h
index 330f46d6f..2984e5321 100644
--- a/Minecraft.Client/TextureMap.h
+++ b/Minecraft.Client/TextureMap.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Minecraft.World/IconRegister.h>
+#include "..\Minecraft.World\IconRegister.h"
 
 class StitchedTexture;
 class Texture;
diff --git a/Minecraft.Client/TexturePack.h b/Minecraft.Client/TexturePack.h
index 12706b540..23cb4f62e 100644
--- a/Minecraft.Client/TexturePack.h
+++ b/Minecraft.Client/TexturePack.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include <Common/App_enums.h>
+#include "Common\App_enums.h"
 
 class InputStream;
 class Minecraft;
diff --git a/Minecraft.Client/TexturePackRepository.cpp b/Minecraft.Client/TexturePackRepository.cpp
index 1e76f71aa..163ec7ba2 100644
--- a/Minecraft.Client/TexturePackRepository.cpp
+++ b/Minecraft.Client/TexturePackRepository.cpp
@@ -5,8 +5,8 @@
 #include "FolderTexturePack.h"
 #include "DLCTexturePack.h"
 #include "Options.h"
-#include <Minecraft.World/File.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\File.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #include "Minimap.h"
 
 TexturePack *TexturePackRepository::DEFAULT_TEXTURE_PACK = NULL;
diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index 8d6c123d6..ab9db75d9 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -3,21 +3,21 @@
 #include "TexturePackRepository.h"
 #include "HttpTexture.h"
 #include "MemTexture.h"
-#include <Minecraft.World/InputStream.h>
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/ByteBuffer.h>
+#include "..\Minecraft.World\InputStream.h"
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\ByteBuffer.h"
 #include "TexturePack.h"
 #include "Options.h"
-#include <Minecraft.Client/MemTextureProcessor.h>
+#include "..\Minecraft.Client\MemTextureProcessor.h"
 #include "MobSkinMemTextureProcessor.h"
 #include "PreStitchedTextureMap.h"
 #include "StitchedTexture.h"
 #include "Texture.h"
-#include <Minecraft.World/net.minecraft.world.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\Minecraft.World\net.minecraft.world.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\StringHelpers.h"
 #include "ResourceLocation.h"
-#include <Minecraft.World/ItemEntity.h>
+#include "..\Minecraft.World\ItemEntity.h"
 #include "TextureAtlas.h"
 
 bool Textures::MIPMAP = true;
diff --git a/Minecraft.Client/Textures.h b/Minecraft.Client/Textures.h
index 3e06db991..eb3d2f6d2 100644
--- a/Minecraft.Client/Textures.h
+++ b/Minecraft.Client/Textures.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/ArrayWithLength.h>
+#include "..\Minecraft.World\ArrayWithLength.h"
 
 class DynamicTexture;
 class BufferedImage;
diff --git a/Minecraft.Client/TheEndPortalRenderer.cpp b/Minecraft.Client/TheEndPortalRenderer.cpp
index 77bceae8b..98c7e7cc5 100644
--- a/Minecraft.Client/TheEndPortalRenderer.cpp
+++ b/Minecraft.Client/TheEndPortalRenderer.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "Tesselator.h"
 #include "TileEntityRenderDispatcher.h"
 #include "Camera.h"
-#include <Minecraft.World/FloatBuffer.h>
+#include "..\Minecraft.World\FloatBuffer.h"
 #include "TheEndPortalRenderer.h"
 
 ResourceLocation TheEndPortalRenderer::END_SKY_LOCATION = ResourceLocation(TN_MISC_TUNNEL);
diff --git a/Minecraft.Client/TileEntityRenderDispatcher.cpp b/Minecraft.Client/TileEntityRenderDispatcher.cpp
index 2e57eca93..f9ecfea44 100644
--- a/Minecraft.Client/TileEntityRenderDispatcher.cpp
+++ b/Minecraft.Client/TileEntityRenderDispatcher.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "TileEntityRenderDispatcher.h"
 #include "TileEntityRenderer.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/PistonPieceEntity.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\PistonPieceEntity.h"
 #include "SignRenderer.h"
 #include "MobSpawnerRenderer.h"
 #include "PistonPieceRenderer.h"
diff --git a/Minecraft.Client/TileEntityRenderDispatcher.h b/Minecraft.Client/TileEntityRenderDispatcher.h
index b7998463a..a9d5fea77 100644
--- a/Minecraft.Client/TileEntityRenderDispatcher.h
+++ b/Minecraft.Client/TileEntityRenderDispatcher.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Textures.h"
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\JavaIntHash.h"
 class Mob;
 class Level;
 class TileEntityRenderer;
diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp
index c0d102b9c..2acc6170a 100644
--- a/Minecraft.Client/TileRenderer.cpp
+++ b/Minecraft.Client/TileRenderer.cpp
@@ -4,11 +4,11 @@
 #include "GameRenderer.h"
 #include "Minecraft.h"
 #include "Textures.h"
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
-#include <Minecraft.World/net.minecraft.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "..\Minecraft.World\net.minecraft.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 #include "Tesselator.h"
 #include "EntityTileRenderer.h"
 #include "Options.h"
diff --git a/Minecraft.Client/Timer.cpp b/Minecraft.Client/Timer.cpp
index f20c81df6..15a2c2f13 100644
--- a/Minecraft.Client/Timer.cpp
+++ b/Minecraft.Client/Timer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Timer.h"
-#include <Minecraft.World/System.h>
+#include "..\Minecraft.World\System.h"
 
 Timer::Timer(float ticksPerSecond)
 {
diff --git a/Minecraft.Client/TitleScreen.cpp b/Minecraft.Client/TitleScreen.cpp
index 8a9e277b3..1c7d5125b 100644
--- a/Minecraft.Client/TitleScreen.cpp
+++ b/Minecraft.Client/TitleScreen.cpp
@@ -5,11 +5,11 @@
 #include "JoinMultiplayerScreen.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/net.minecraft.locale.h>
-#include <Minecraft.World/System.h>
-#include <Minecraft.World/Random.h>
+#include "..\Minecraft.World\StringHelpers.h"
+#include "..\Minecraft.World\InputOutputStream.h"
+#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "..\Minecraft.World\System.h"
+#include "..\Minecraft.World\Random.h"
 #include "TitleScreen.h"
 
 Random *TitleScreen::random = new Random();
diff --git a/Minecraft.Client/TntMinecartRenderer.cpp b/Minecraft.Client/TntMinecartRenderer.cpp
index a83a6a70d..b168e174b 100644
--- a/Minecraft.Client/TntMinecartRenderer.cpp
+++ b/Minecraft.Client/TntMinecartRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "TntMinecartRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 void TntMinecartRenderer::renderMinecartContents(shared_ptr<Minecart> _cart, float a, Tile *tile, int tileData)
 {
diff --git a/Minecraft.Client/TntRenderer.cpp b/Minecraft.Client/TntRenderer.cpp
index a81f9c921..52e2877dc 100644
--- a/Minecraft.Client/TntRenderer.cpp
+++ b/Minecraft.Client/TntRenderer.cpp
@@ -2,8 +2,8 @@
 #include "TntRenderer.h"
 #include "TextureAtlas.h"
 #include "TileRenderer.h"
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 TntRenderer::TntRenderer()
 {
diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp
index 19e247d1a..6e956b15a 100644
--- a/Minecraft.Client/TrackedEntity.cpp
+++ b/Minecraft.Client/TrackedEntity.cpp
@@ -2,18 +2,18 @@
 #include "TrackedEntity.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/net.minecraft.world.entity.item.h>
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.entity.global.h>
-#include <Minecraft.World/net.minecraft.world.entity.projectile.h>
-#include <Minecraft.World/net.minecraft.network.packet.h>
-#include <Minecraft.World/net.minecraft.world.item.h>
-#include <Minecraft.World/net.minecraft.world.level.saveddata.h>
-#include <Minecraft.World/net.minecraft.world.entity.ai.attributes.h>
+#include "..\Minecraft.World\Mth.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
+#include "..\Minecraft.World\net.minecraft.network.packet.h"
+#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
 #include "PlayerList.h"
diff --git a/Minecraft.Client/TrapScreen.cpp b/Minecraft.Client/TrapScreen.cpp
index 8b5c63512..c7eb1472c 100644
--- a/Minecraft.Client/TrapScreen.cpp
+++ b/Minecraft.Client/TrapScreen.cpp
@@ -2,9 +2,9 @@
 #include "TrapScreen.h"
 #include "LocalPlayer.h"
 #include "Textures.h"
-#include <Minecraft.World/net.minecraft.world.inventory.h>
-#include <Minecraft.World/DispenserTileEntity.h>
-#include <Minecraft.World/net.minecraft.world.h>
+#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "..\Minecraft.World\DispenserTileEntity.h"
+#include "..\Minecraft.World\net.minecraft.world.h"
 
 TrapScreen::TrapScreen(shared_ptr<Inventory> inventory, shared_ptr<DispenserTileEntity> trap) : AbstractContainerScreen(new TrapMenu(inventory, trap))
 {
diff --git a/Minecraft.Client/User.cpp b/Minecraft.Client/User.cpp
index 6eed961e3..b8e2f2c05 100644
--- a/Minecraft.Client/User.cpp
+++ b/Minecraft.Client/User.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "User.h"
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 vector<Tile *> User::allowedTiles;
 
diff --git a/Minecraft.Client/Vertex.h b/Minecraft.Client/Vertex.h
index f33da083b..c52f499f1 100644
--- a/Minecraft.Client/Vertex.h
+++ b/Minecraft.Client/Vertex.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/Vec3.h>
+#include "..\Minecraft.World\Vec3.h"
 
 class Vertex
 {
diff --git a/Minecraft.Client/VideoSettingsScreen.cpp b/Minecraft.Client/VideoSettingsScreen.cpp
index 17b68703e..5c948cdd1 100644
--- a/Minecraft.Client/VideoSettingsScreen.cpp
+++ b/Minecraft.Client/VideoSettingsScreen.cpp
@@ -4,7 +4,7 @@
 #include "SlideButton.h"
 #include "Options.h"
 #include "ControlsScreen.h"
-#include <Minecraft.World/net.minecraft.locale.h>
+#include "..\Minecraft.World\net.minecraft.locale.h"
 
 VideoSettingsScreen::VideoSettingsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/ViewportCuller.cpp b/Minecraft.Client/ViewportCuller.cpp
index e1b452610..41a8eb368 100644
--- a/Minecraft.Client/ViewportCuller.cpp
+++ b/Minecraft.Client/ViewportCuller.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ViewportCuller.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 
 ViewportCuller::Face::Face(double x, double y, double z, float yRot, float xRot)
 {
diff --git a/Minecraft.Client/ViewportCuller.h b/Minecraft.Client/ViewportCuller.h
index 6b2574dc4..4e9121a63 100644
--- a/Minecraft.Client/ViewportCuller.h
+++ b/Minecraft.Client/ViewportCuller.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Culler.h"
-#include <Minecraft.World/Mob.h>
+#include "..\Minecraft.World\mob.h"
 
 class Mob;
 class ViewportCuller : public Culler
diff --git a/Minecraft.Client/VillagerGolemModel.cpp b/Minecraft.Client/VillagerGolemModel.cpp
index a73da72c2..e8b1bf278 100644
--- a/Minecraft.Client/VillagerGolemModel.cpp
+++ b/Minecraft.Client/VillagerGolemModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 #include "ModelPart.h"
 #include "VillagerGolemModel.h"
 
diff --git a/Minecraft.Client/VillagerGolemRenderer.cpp b/Minecraft.Client/VillagerGolemRenderer.cpp
index f936ff494..5d6809784 100644
--- a/Minecraft.Client/VillagerGolemRenderer.cpp
+++ b/Minecraft.Client/VillagerGolemRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 #include "VillagerGolemModel.h"
 #include "ModelPart.h"
 #include "TextureAtlas.h"
diff --git a/Minecraft.Client/VillagerModel.cpp b/Minecraft.Client/VillagerModel.cpp
index f2fe8d8d8..669637af9 100644
--- a/Minecraft.Client/VillagerModel.cpp
+++ b/Minecraft.Client/VillagerModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "VillagerModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 
diff --git a/Minecraft.Client/VillagerRenderer.cpp b/Minecraft.Client/VillagerRenderer.cpp
index d0b1257e4..ac885747c 100644
--- a/Minecraft.Client/VillagerRenderer.cpp
+++ b/Minecraft.Client/VillagerRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.npc.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
 #include "VillagerModel.h"
 #include "VillagerRenderer.h"
 
diff --git a/Minecraft.Client/VillagerZombieModel.cpp b/Minecraft.Client/VillagerZombieModel.cpp
index 5a4b71f6b..25b8f66ea 100644
--- a/Minecraft.Client/VillagerZombieModel.cpp
+++ b/Minecraft.Client/VillagerZombieModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ModelPart.h"
 #include "VillagerZombieModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 
 void VillagerZombieModel::_init(float g, float yOffset, bool isArmor)
 {
diff --git a/Minecraft.Client/WaterDropParticle.cpp b/Minecraft.Client/WaterDropParticle.cpp
index 6c21e7b14..90035243e 100644
--- a/Minecraft.Client/WaterDropParticle.cpp
+++ b/Minecraft.Client/WaterDropParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "WaterDropParticle.h"
-#include <Minecraft.World/JavaMath.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.material.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "..\Minecraft.World\JavaMath.h"
+#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 WaterDropParticle::WaterDropParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
index ddcd8161d..dea9e3155 100644
--- a/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
+++ b/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
@@ -1,4 +1,4 @@
-#include <stdafx.h> // 4J
+#include "stdafx.h" // 4J
 
 // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools
 //
diff --git a/Minecraft.Client/Windows64/Iggy/include/iggy.h b/Minecraft.Client/Windows64/Iggy/include/iggy.h
index b160d53c7..56638a321 100644
--- a/Minecraft.Client/Windows64/Iggy/include/iggy.h
+++ b/Minecraft.Client/Windows64/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include <rrcore.h>   // base data types, macros
+#include "rrcore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
index 86c2041ae..4141e3f95 100644
--- a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
+++ b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "Common\Leaderboards\LeaderboardManager.h"
 
 class WindowsLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
index f3e17e557..19fc25987 100644
--- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
+++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
@@ -3,8 +3,8 @@
 #ifdef _WINDOWS64
 
 #include "WinsockNetLayer.h"
-#include <Common/Network/PlatformNetworkManagerStub.h>
-#include <Minecraft.World/Socket.h>
+#include "..\..\Common\Network\PlatformNetworkManagerStub.h"
+#include "..\..\..\Minecraft.World\Socket.h"
 
 SOCKET WinsockNetLayer::s_listenSocket = INVALID_SOCKET;
 SOCKET WinsockNetLayer::s_hostConnectionSocket = INVALID_SOCKET;
diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h
index 631e57237..96b03c9ba 100644
--- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.h
+++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.h
@@ -5,7 +5,7 @@
 #include <WinSock2.h>
 #include <WS2tcpip.h>
 #include <vector>
-#include <Common/Network/NetworkPlayerInterface.h>
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
 
 #pragma comment(lib, "Ws2_32.lib")
 
diff --git a/Minecraft.Client/Windows64/Windows64_App.cpp b/Minecraft.Client/Windows64/Windows64_App.cpp
index 0a842bd43..461e8c348 100644
--- a/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/Minecraft.Client/Windows64/Windows64_App.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include <Common/Consoles_App.h>
-#include <User.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <Minecraft.World/BiomeSource.h>
-#include <Minecraft.World/LevelType.h>
+#include "..\Common\Consoles_App.h"
+#include "..\User.h"
+#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\..\Minecraft.Client\MinecraftServer.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\..\Minecraft.World\BiomeSource.h"
+#include "..\..\Minecraft.World\LevelType.h"
 
 wstring g_playerName;
 
diff --git a/Minecraft.Client/Windows64/Windows64_App.h b/Minecraft.Client/Windows64/Windows64_App.h
index d67008c51..bff916ec7 100644
--- a/Minecraft.Client/Windows64/Windows64_App.h
+++ b/Minecraft.Client/Windows64/Windows64_App.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <4JLibs/inc/4J_Render.h>
+#include "4JLibs\inc\4J_Render.h"
 
 class CConsoleMinecraftApp : public CMinecraftApp
 {
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 6525d198f..529399308 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -5,41 +5,41 @@
 
 #include <assert.h>
 #include <ShellScalingApi.h>
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
 
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-//#include <Social/SocialManager.h>
-//#include <Leaderboards/LeaderboardManager.h>
-//#include <XUI/XUI_Scene_Container.h>
-//#include <NetworkManager.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+//#include "Social\SocialManager.h"
+//#include "Leaderboards\LeaderboardManager.h"
+//#include "XUI\XUI_Scene_Container.h"
+//#include "NetworkManager.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
 #include "Resource.h"
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-#include <Network/WinsockNetLayer.h>
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
+#include "Network\WinsockNetLayer.h"
 
-#include <Xbox/resource.h>
+#include "Xbox/resource.h"
 
 #ifdef _MSC_VER
 #pragma comment(lib, "legacy_stdio_definitions.lib")
diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp
index 918605935..10ae20aff 100644
--- a/Minecraft.Client/Windows64/Windows64_UIController.cpp
+++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp
@@ -2,8 +2,8 @@
 #include "Windows64_UIController.h"
 
 // Temp
-#include <Minecraft.h>
-#include <Textures.h>
+#include "..\Minecraft.h"
+#include "..\Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/Windows64/Windows64_UIController.h b/Minecraft.Client/Windows64/Windows64_UIController.h
index 459e27ce0..2b2ccdbac 100644
--- a/Minecraft.Client/Windows64/Windows64_UIController.h
+++ b/Minecraft.Client/Windows64/Windows64_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/UIController.h>
+#include "..\Common\UI\UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/WitchModel.cpp b/Minecraft.Client/WitchModel.cpp
index 4581d31c3..2ac56697b 100644
--- a/Minecraft.Client/WitchModel.cpp
+++ b/Minecraft.Client/WitchModel.cpp
@@ -2,7 +2,7 @@
 #include "ModelPart.h"
 #include "WitchModel.h"
 #include "VillagerModel.h"
-#include <Minecraft.World/Mth.h>
+#include "../Minecraft.World/Mth.h"
 
 WitchModel::WitchModel(float g) : VillagerModel(g, 0, 64, 128)
 {
diff --git a/Minecraft.Client/WitchRenderer.cpp b/Minecraft.Client/WitchRenderer.cpp
index e1ab2a195..5e0f2b103 100644
--- a/Minecraft.Client/WitchRenderer.cpp
+++ b/Minecraft.Client/WitchRenderer.cpp
@@ -3,7 +3,7 @@
 #include "WitchRenderer.h"
 #include "WitchModel.h"
 #include "ModelPart.h"
-#include <Minecraft.World/net.minecraft.world.item.h>
+#include "..\Minecraft.World\net.minecraft.world.item.h"
 
 ResourceLocation WitchRenderer::WITCH_LOCATION = ResourceLocation(TN_MOB_WITCH);
 
diff --git a/Minecraft.Client/WitherBossModel.cpp b/Minecraft.Client/WitherBossModel.cpp
index 460258cda..626a89505 100644
--- a/Minecraft.Client/WitherBossModel.cpp
+++ b/Minecraft.Client/WitherBossModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "WitherBossModel.h"
-#include <Minecraft.World/WitherBoss.h>
+#include "..\Minecraft.World\WitherBoss.h"
 #include "ModelPart.h"
 
 WitherBossModel::WitherBossModel()
diff --git a/Minecraft.Client/WitherBossRenderer.cpp b/Minecraft.Client/WitherBossRenderer.cpp
index bc7a497fd..254a00bc7 100644
--- a/Minecraft.Client/WitherBossRenderer.cpp
+++ b/Minecraft.Client/WitherBossRenderer.cpp
@@ -2,8 +2,8 @@
 #include "WitherBossRenderer.h"
 #include "WitherBossModel.h"
 #include "MobRenderer.h"
-#include <Minecraft.World/WitherBoss.h>
-#include <Minecraft.Client/BossMobGuiInfo.h>
+#include "../Minecraft.World/WitherBoss.h"
+#include "../Minecraft.Client/BossMobGuiInfo.h"
 
 ResourceLocation WitherBossRenderer::WITHER_ARMOR_LOCATION = ResourceLocation(TN_MOB_WITHER_ARMOR);
 ResourceLocation WitherBossRenderer::WITHER_INVULERABLE_LOCATION = ResourceLocation(TN_MOB_WITHER_INVULNERABLE);
diff --git a/Minecraft.Client/WitherSkullRenderer.cpp b/Minecraft.Client/WitherSkullRenderer.cpp
index 5280d1bf3..878735740 100644
--- a/Minecraft.Client/WitherSkullRenderer.cpp
+++ b/Minecraft.Client/WitherSkullRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "WitherSkullRenderer.h"
 #include "SkeletonHeadModel.h"
-#include <Minecraft.World/WitherSkull.h>
+#include "../Minecraft.World/WitherSkull.h"
 
 ResourceLocation WitherSkullRenderer::WITHER_ARMOR_LOCATION(TN_MOB_WITHER_INVULNERABLE);
 ResourceLocation WitherSkullRenderer::WITHER_LOCATION(TN_MOB_WITHER);
diff --git a/Minecraft.Client/WolfModel.cpp b/Minecraft.Client/WolfModel.cpp
index e9e935774..d459240d0 100644
--- a/Minecraft.Client/WolfModel.cpp
+++ b/Minecraft.Client/WolfModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "WolfModel.h"
-#include <Minecraft.World/Wolf.h>
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Wolf.h"
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 WolfModel::WolfModel()
diff --git a/Minecraft.Client/WolfModel.h b/Minecraft.Client/WolfModel.h
index 916a72fd1..4b7bda6c3 100644
--- a/Minecraft.Client/WolfModel.h
+++ b/Minecraft.Client/WolfModel.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Model.h"
-#include <Minecraft.World/Mob.h>
+#include "..\Minecraft.World\Mob.h"
 
 class WolfModel : public Model
 {
diff --git a/Minecraft.Client/WolfRenderer.cpp b/Minecraft.Client/WolfRenderer.cpp
index e846b5fbd..c4577db88 100644
--- a/Minecraft.Client/WolfRenderer.cpp
+++ b/Minecraft.Client/WolfRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "WolfRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include <Minecraft.World/net.minecraft.world.entity.animal.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
 
 ResourceLocation *WolfRenderer::WOLF_LOCATION = new ResourceLocation(TN_MOB_WOLF);
 ResourceLocation *WolfRenderer::WOLF_TAME_LOCATION = new ResourceLocation(TN_MOB_WOLF_TAME);
diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
index fbf1a64d9..b088150c9 100644
--- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
-#include <Minecraft.World/net.minecraft.world.entity.h>
-#include <Minecraft.World/Mth.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.h>
-#include <MultiplayerLocalPlayer.h>
+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "..\..\..\Minecraft.World\Mth.h"
+#include "..\..\..\Minecraft.World\Random.h"
+#include "..\..\..\Minecraft.World\LevelData.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
 #include "SoundEngine.h"
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <Common/DLC/DLCAudioFile.h>
-#include <DLCTexturePack.h>
+#include "..\..\TexturePackRepository.h"
+#include "..\..\TexturePack.h"
+#include "..\..\Common\DLC\DLCAudioFile.h"
+#include "..\..\DLCTexturePack.h"
 
 
 IXAudio2* g_pXAudio2 = NULL;       // pointer to XAudio2 instance used by QNet and XACT
diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.h b/Minecraft.Client/Xbox/Audio/SoundEngine.h
index 1c9535c1d..e2f22869b 100644
--- a/Minecraft.Client/Xbox/Audio/SoundEngine.h
+++ b/Minecraft.Client/Xbox/Audio/SoundEngine.h
@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include <Minecraft.World/SoundTypes.h>
+#include "..\..\..\Minecraft.World\SoundTypes.h"
 
 #ifdef _XBOX
 extern IXAudio2* g_pXAudio2;       // pointer to XAudio2 instance used by QNet and XACT
diff --git a/Minecraft.Client/Xbox/Font/XUI_Font.cpp b/Minecraft.Client/Xbox/Font/XUI_Font.cpp
index 309927e2b..8b1a624be 100644
--- a/Minecraft.Client/Xbox/Font/XUI_Font.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_Font.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include <Tesselator.h>
+#include "..\..\Tesselator.h"
 #include "XUI_FontData.h"
 #include "XUI_Font.h"
 
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
index 047867b73..7a70cdfbb 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <stubs.h>
-#include <Minecraft.h>
-#include <Textures.h>
+#include "..\..\stubs.h"
+#include "..\..\Minecraft.h"
+#include "..\..\Textures.h"
 #include "XUI_FontData.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 
 #define USE_NEW 0
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Xbox/Font/XUI_FontData.h
index 0a7ab4347..af18c7a65 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontData.h
+++ b/Minecraft.Client/Xbox/Font/XUI_FontData.h
@@ -2,7 +2,7 @@
 using namespace std;
 #include <xuirender.h>
 
-#include <Common/UI/UIFontData.h>
+#include "..\..\Common\UI\UIFontData.h"
 
 // 4J This class is partially based of the ATG font implementation
 //--------------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
index da3f530ba..485819057 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
@@ -2,7 +2,7 @@
 #include "XUI_FontRenderer.h"
 #include "XUI_Font.h"
 #include "XUI_FontData.h"
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 
 extern IDirect3DDevice9 *g_pD3DDevice;
 extern void GetRenderAndSamplerStates(IDirect3DDevice9 *pDevice,DWORD *RenderStateA,DWORD *SamplerStateA);
diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
index 9b8f869de..efa8a3dae 100644
--- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
+++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
@@ -2,7 +2,7 @@
 
 #include "XboxLeaderboardManager.h"
 
-#include <Network/NetworkPlayerXbox.h>
+#include "..\Network\NetworkPlayerXbox.h"
 
 #ifdef _XBOX
 LeaderboardManager *LeaderboardManager::m_instance = new XboxLeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
index d4c0666eb..c9990901c 100644
--- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
+++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
@@ -3,7 +3,7 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 
-#include <Common/Leaderboards/LeaderboardManager.h>
+#include "..\..\Common\Leaderboards\LeaderboardManager.h"
 
 class XboxLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
index 4a2f5fc25..bec7a1255 100644
--- a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
+++ b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/Network/NetworkPlayerInterface.h>
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
 
 // This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is
 // managed by PlatformNetworkManagerXbox.
diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
index 49c17d627..a551725b0 100644
--- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
+++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/StringHelpers.h>
+#include "..\..\..\Minecraft.World\Socket.h"
+#include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "PlatformNetworkManagerXbox.h"
 #include "NetworkPlayerXbox.h"
-#include <Common/Network/GameNetworkManager.h>
+#include "..\..\Common\Network\GameNetworkManager.h"
 
 CPlatformNetworkManagerXbox *g_pPlatformNetworkManager;
 
diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
index 008089459..7c6112b4e 100644
--- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
+++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
@@ -2,10 +2,10 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include <Minecraft.World/C4JThread.h>
-#include <Common/Network/NetworkPlayerInterface.h>
-#include <Common/Network/PlatformNetworkManagerInterface.h>
-#include <Common/Network/SessionInfo.h>
+#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
+#include "..\..\Common\Network\SessionInfo.h"
 
 // This is how often we allow a search for new games
 #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000
diff --git a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
index cb8ad2492..5d2b97631 100644
--- a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
+++ b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Include/SenClientMain.h>
-#include <Include/SenClientDynamicConfig.h>
+#include "Include\SenClientMain.h"
+#include "Include\SenClientDynamicConfig.h"
 #include "DynamicConfigurations.h"
 
 
diff --git a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
index 795aabb95..aade06bca 100644
--- a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
+++ b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include <Include/SenClientCore.h>
-#include <Include/SenClientMain.h>
-#include <Include/SenClientMain.h>
+#include "Include\SenClientCore.h"
+#include "Include\SenClientMain.h"
+#include "Include\SenClientMain.h"
 
-#include <GameConfig/Minecraft.spa.h>
-#include <Minecraft.h>
-#include <MultiplayerLocalPlayer.h>
-#include <Minecraft.World/Dimension.h>
-#include <Minecraft.World/net.minecraft.world.level.h>
-#include <Minecraft.World/net.minecraft.world.level.storage.h>
+#include "..\GameConfig\Minecraft.spa.h"
+#include "..\..\Minecraft.h"
+#include "..\..\MultiplayerLocalPlayer.h"
+#include "..\..\..\Minecraft.World\Dimension.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
 
 #include "SentientManager.h"
 #include "MinecraftTelemetry.h"
diff --git a/Minecraft.Client/Xbox/Social/SocialManager.cpp b/Minecraft.Client/Xbox/Social/SocialManager.cpp
index a2fb0d177..b7a108bc7 100644
--- a/Minecraft.Client/Xbox/Social/SocialManager.cpp
+++ b/Minecraft.Client/Xbox/Social/SocialManager.cpp
@@ -9,7 +9,7 @@
 #include "SocialManager.h"
 #include <assert.h>
 #include <xgraphics.h>
-#include <Sentient/SentientManager.h>
+#include "..\Sentient\SentientManager.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // Constants.
diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp
index 90afe222e..b252035e6 100644
--- a/Minecraft.Client/Xbox/Xbox_App.cpp
+++ b/Minecraft.Client/Xbox/Xbox_App.cpp
@@ -1,175 +1,175 @@
 #include "stdafx.h"
 
-#include <Common/UI/UIStructs.h>
+#include "..\Common\UI\UIStructs.h"
 
-#include <Common/XUI/XUI_Intro.h>
-#include <Common/XUI/XUI_MainMenu.h>
-#include <Common/XUI/XUI_NewUpdateMessage.h>
-#include <Common/XUI/XUI_HelpAndOptions.h>
-#include <Common/XUI/XUI_TextEntry.h>
-#include <Common/XUI/XUI_HelpHowToPlay.h>	
-#include <Common/XUI/XUI_HowToPlayMenu.h>
-#include <Common/XUI/XUI_HelpControls.h>
-#include <Common/XUI/XUI_TextEntry.h>
-#include <Common/XUI/XUI_LoadSettings.h>
-#include <Common/XUI/XUI_SettingsAll.h>
-#include <Common/XUI/XUI_SettingsOptions.h>
-#include <Common/XUI/XUI_SettingsAudio.h>
-#include <Common/XUI/XUI_SettingsControl.h>
-#include <Common/XUI/XUI_SettingsGraphics.h>
-#include <Common/XUI/XUI_SettingsUI.h>
-#include <Common/XUI/XUI_Leaderboards.h>
-#include <Common/XUI/XUI_Debug.h>
-#include <Common/XUI/XUI_DebugTips.h>
-#include <Common/XUI/XUI_Reinstall.h>
-#include <Common/XUI/XUI_Death.h>
-#include <Common/XUI/XUI_DebugOverlay.h>
-#include <Common/XUI/XUI_DLCOffers.h>
-#include <Common/XUI/XUI_SocialPost.h>
-#include <Common/XUI/XUI_Scene_Container.h>
-#include <Common/XUI/XUI_Scene_Furnace.h>
-#include <Common/XUI/XUI_Scene_Inventory.h>
-#include <Common/XUI/XUI_Scene_Trap.h>
-#include <Common/XUI/XUI_Control_ComboBox.h>
-#include <Common/XUI/XUI_MultiGameInfo.h>
-#include <Common/XUI/XUI_MultiGameJoinLoad.h>
-#include <Common/XUI/XUI_MultiGameCreate.h>
-#include <Common/XUI/XUI_MultiGameLaunchMoreOptions.h>
-#include <Common/XUI/XUI_SignEntry.h>
-#include <Common/XUI/XUI_InGameInfo.h>
-#include <Common/XUI/XUI_TrialExitUpsell.h>
-#include <Common/XUI/XUI_BasePlayer.h>
-#include <Common/XUI/XUI_PartnernetPassword.h>
-#include <Common/XUI/XUI_SaveMessage.h>
-#include <Common/XUI/XUI_Chat.h>
-#include <Common/XUI/XUI_SkinSelect.h>
-#include <Common/XUI/XUI_InGameHostOptions.h>
-#include <Common/XUI/XUI_InGamePlayerOptions.h>
-#include <Common/XUI/XUI_Scene_Enchant.h>
-#include <Common/XUI/XUI_Scene_BrewingStand.h>
-#include <Common/XUI/XUI_XZP_Icons.h>
-#include <Common/XUI/XUI_Controls.h>
-#include <Common/XUI/XUI_Scene_Win.h>
-#include <Common/XUI/XUI_HUD.h>
-#include <Common/XUI/XUI_DebugSetCamera.h>
-//#include <Common/XUI/XUI_TransferToXboxOne.h>
+#include "..\Common\XUI\XUI_Intro.h"
+#include "..\Common\XUI\XUI_MainMenu.h"
+#include "..\Common\XUI\XUI_NewUpdateMessage.h"
+#include "..\Common\XUI\XUI_HelpAndOptions.h"
+#include "..\Common\XUI\XUI_TextEntry.h"
+#include "..\Common\XUI\XUI_HelpHowToPlay.h"	
+#include "..\Common\XUI\XUI_HowToPlayMenu.h"
+#include "..\Common\XUI\XUI_HelpControls.h"
+#include "..\Common\XUI\XUI_TextEntry.h"
+#include "..\Common\XUI\XUI_LoadSettings.h"
+#include "..\Common\XUI\XUI_SettingsAll.h"
+#include "..\Common\XUI\XUI_SettingsOptions.h"
+#include "..\Common\XUI\XUI_SettingsAudio.h"
+#include "..\Common\XUI\XUI_SettingsControl.h"
+#include "..\Common\XUI\XUI_SettingsGraphics.h"
+#include "..\Common\XUI\XUI_SettingsUI.h"
+#include "..\Common\XUI\XUI_Leaderboards.h"
+#include "..\Common\XUI\XUI_Debug.h"
+#include "..\Common\XUI\XUI_DebugTips.h"
+#include "..\Common\XUI\XUI_Reinstall.h"
+#include "..\Common\XUI\XUI_Death.h"
+#include "..\Common\XUI\XUI_DebugOverlay.h"
+#include "..\Common\XUI\XUI_DLCOffers.h"
+#include "..\Common\XUI\XUI_SocialPost.h"
+#include "..\Common\XUI\XUI_Scene_Container.h"
+#include "..\Common\XUI\XUI_Scene_Furnace.h"
+#include "..\Common\XUI\XUI_Scene_Inventory.h"
+#include "..\Common\XUI\XUI_Scene_Trap.h"
+#include "..\Common\XUI\XUI_Control_ComboBox.h"
+#include "..\Common\XUI\XUI_MultiGameInfo.h"
+#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
+#include "..\Common\XUI\XUI_MultiGameCreate.h"
+#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h"
+#include "..\Common\XUI\XUI_SignEntry.h"
+#include "..\Common\XUI\XUI_InGameInfo.h"
+#include "..\Common\XUI\XUI_TrialExitUpsell.h"
+#include "..\Common\XUI\XUI_BasePlayer.h"
+#include "..\Common\XUI\XUI_PartnernetPassword.h"
+#include "..\Common\XUI\XUI_SaveMessage.h"
+#include "..\Common\XUI\XUI_Chat.h"
+#include "..\Common\XUI\XUI_SkinSelect.h"
+#include "..\Common\XUI\XUI_InGameHostOptions.h"
+#include "..\Common\XUI\XUI_InGamePlayerOptions.h"
+#include "..\Common\XUI\XUI_Scene_Enchant.h"
+#include "..\Common\XUI\XUI_Scene_BrewingStand.h"
+#include "..\Common\XUI\XUI_XZP_Icons.h"
+#include "..\Common\XUI\XUI_Controls.h"
+#include "..\Common\XUI\XUI_Scene_Win.h"
+#include "..\Common\XUI\XUI_HUD.h"
+#include "..\Common\XUI\XUI_DebugSetCamera.h"
+//#include "..\Common\XUI\XUI_TransferToXboxOne.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
-#include <Common/XUI/XUI_DebugItemEditor.h>
+#include "..\Common\XUI\XUI_DebugItemEditor.h"
 #endif
 #ifndef _CONTENT_PACKAGE
-#include <Common/XUI/XUI_DebugSchematicCreator.h>
+#include "..\Common\XUI\XUI_DebugSchematicCreator.h"
 #endif
 
-#include <Minecraft.World/Recipy.h>
-#include <GameConfig/Minecraft.spa.h>
-#include <Minecraft.Client/Options.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <MinecraftServer.h>
-#include <GameRenderer.h>
-#include <ProgressRenderer.h>
-#include <Minecraft.Client/LevelRenderer.h>
-#include <Minecraft.Client/MobSkinMemTextureProcessor.h>
+#include "..\..\Minecraft.World\Recipy.h"
+#include "GameConfig\Minecraft.spa.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\MinecraftServer.h"
+#include "..\GameRenderer.h"
+#include "..\ProgressRenderer.h"
+#include "..\..\Minecraft.Client\LevelRenderer.h"
+#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
 
-#include <Minecraft.Client/Minecraft.h>
+#include "..\..\Minecraft.Client\Minecraft.h"
 
-#include <ClientConnection.h>
-#include <MultiPlayerLocalPlayer.h>
-#include <Minecraft.Client/LocalPlayer.h>
-#include <Minecraft.World/Player.h>
-#include <Minecraft.World/Inventory.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/FurnaceTileEntity.h>
-#include <Minecraft.World/Container.h>
-#include <Minecraft.World/DispenserTileEntity.h>
-#include <Minecraft.World/SignTileEntity.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <GameMode.h>
-#include <Social/SocialManager.h>
+#include "..\ClientConnection.h"
+#include "..\MultiPlayerLocalPlayer.h"
+#include "..\..\Minecraft.Client\LocalPlayer.h"
+#include "..\..\Minecraft.World\Player.h"
+#include "..\..\Minecraft.World\Inventory.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\FurnaceTileEntity.h"
+#include "..\..\Minecraft.World\Container.h"
+#include "..\..\Minecraft.World\DispenserTileEntity.h"
+#include "..\..\Minecraft.World\SignTileEntity.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\GameMode.h"
+#include "Social\SocialManager.h"
 #include <xgraphics.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Minecraft.Client/Xbox/XML/ATGXmlParser.h>
-#include <Minecraft.Client/Xbox/XML/xmlFilesCallback.h>
-#include <4JLibs/inc/4J_Input.h>
-#include <Font/XUI_FontRenderer.h>
-#include <Common/Minecraft_Macros.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Common/GameRules/ConsoleGameRules.h>
-#include <Common/GameRules/ConsoleSchematicFile.h>
-#include <Minecraft.World/InputOutputStream.h>
-#include <Minecraft.World/LevelSettings.h>
-#include <User.h>
+#include "..\Common\Tutorial\TutorialMode.h"
+#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
+#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
+#include "4JLibs\inc\4J_Input.h"
+#include "Font\XUI_FontRenderer.h"
+#include "..\Common\Minecraft_Macros.h"
+#include "..\..\Minecraft.Client\PlayerList.h"
+#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\Common\GameRules\ConsoleGameRules.h"
+#include "..\Common\GameRules\ConsoleSchematicFile.h"
+#include "..\..\Minecraft.World\InputOutputStream.h"
+#include "..\..\Minecraft.World\LevelSettings.h"
+#include "..\User.h"
 
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.World/net.minecraft.world.entity.player.h>
-#include <Minecraft.Client/EntityRenderDispatcher.h>
-#include <Minecraft.World/compression.h>
-#include <TexturePackRepository.h>
-#include <TexturePack.h>
-#include <Common/DLC/DLCAudioFile.h>
-#include <DLCTexturePack.h>
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\LevelData.h"
+#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "..\..\Minecraft.Client\EntityRenderDispatcher.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\TexturePackRepository.h"
+#include "..\TexturePack.h"
+#include "..\Common\DLC\DLCAudioFile.h"
+#include "..\DLCTexturePack.h"
 
-#include <Common/XUI/XUI_Intro.h>
-#include <Common/XUI/XUI_MainMenu.h>
-#include <Common/XUI/XUI_NewUpdateMessage.h>
-#include <Common/XUI/XUI_HelpAndOptions.h>
-#include <Common/XUI/XUI_TextEntry.h>
-#include <Common/XUI/XUI_HelpHowToPlay.h>	
-#include <Common/XUI/XUI_HowToPlayMenu.h>
-#include <Common/XUI/XUI_HelpControls.h>
-#include <Common/XUI/XUI_TextEntry.h>
-#include <Common/XUI/XUI_LoadSettings.h>
-#include <Common/XUI/XUI_SettingsAll.h>
-#include <Common/XUI/XUI_SettingsOptions.h>
-#include <Common/XUI/XUI_SettingsAudio.h>
-#include <Common/XUI/XUI_SettingsControl.h>
-#include <Common/XUI/XUI_SettingsGraphics.h>
-#include <Common/XUI/XUI_SettingsUI.h>
-#include <Common/XUI/XUI_Leaderboards.h>
-#include <Common/XUI/XUI_Debug.h>
-#include <Common/XUI/XUI_DebugTips.h>
-#include <Common/XUI/XUI_Reinstall.h>
-#include <Common/XUI/XUI_Death.h>
-#include <Common/XUI/XUI_DebugOverlay.h>
-#include <Common/XUI/XUI_DLCOffers.h>
-#include <Common/XUI/XUI_SocialPost.h>
-#include <Common/XUI/XUI_Scene_Container.h>
-#include <Common/XUI/XUI_Scene_Furnace.h>
-#include <Common/XUI/XUI_Scene_Inventory.h>
-#include <Common/XUI/XUI_Scene_Trap.h>
-#include <Common/XUI/XUI_Control_ComboBox.h>
-#include <Common/XUI/XUI_MultiGameInfo.h>
-#include <Common/XUI/XUI_MultiGameJoinLoad.h>
-#include <Common/XUI/XUI_MultiGameCreate.h>
-#include <Common/XUI/XUI_MultiGameLaunchMoreOptions.h>
-#include <Common/XUI/XUI_SignEntry.h>
-#include <Common/XUI/XUI_InGameInfo.h>
-#include <Common/XUI/XUI_TrialExitUpsell.h>
-#include <Common/XUI/XUI_BasePlayer.h>
-#include <Common/XUI/XUI_PartnernetPassword.h>
-#include <Common/XUI/XUI_SaveMessage.h>
-#include <Common/XUI/XUI_Chat.h>
-#include <Common/XUI/XUI_SkinSelect.h>
-#include <Common/XUI/XUI_InGameHostOptions.h>
-#include <Common/XUI/XUI_InGamePlayerOptions.h>
-#include <Common/XUI/XUI_Scene_Enchant.h>
-#include <Common/XUI/XUI_Scene_BrewingStand.h>
-#include <Common/XUI/XUI_XZP_Icons.h>
-#include <Common/XUI/XUI_Controls.h>
-#include <Common/XUI/XUI_Scene_Win.h>
-#include <Common/XUI/XUI_HUD.h>
-#include <Common/XUI/XUI_Scene_Anvil.h>
-#include <Common/XUI/XUI_Scene_Trading.h>
-#include <Common/XUI/XUI_Teleport.h>
+#include "..\Common\XUI\XUI_Intro.h"
+#include "..\Common\XUI\XUI_MainMenu.h"
+#include "..\Common\XUI\XUI_NewUpdateMessage.h"
+#include "..\Common\XUI\XUI_HelpAndOptions.h"
+#include "..\Common\XUI\XUI_TextEntry.h"
+#include "..\Common\XUI\XUI_HelpHowToPlay.h"	
+#include "..\Common\XUI\XUI_HowToPlayMenu.h"
+#include "..\Common\XUI\XUI_HelpControls.h"
+#include "..\Common\XUI\XUI_TextEntry.h"
+#include "..\Common\XUI\XUI_LoadSettings.h"
+#include "..\Common\XUI\XUI_SettingsAll.h"
+#include "..\Common\XUI\XUI_SettingsOptions.h"
+#include "..\Common\XUI\XUI_SettingsAudio.h"
+#include "..\Common\XUI\XUI_SettingsControl.h"
+#include "..\Common\XUI\XUI_SettingsGraphics.h"
+#include "..\Common\XUI\XUI_SettingsUI.h"
+#include "..\Common\XUI\XUI_Leaderboards.h"
+#include "..\Common\XUI\XUI_Debug.h"
+#include "..\Common\XUI\XUI_DebugTips.h"
+#include "..\Common\XUI\XUI_Reinstall.h"
+#include "..\Common\XUI\XUI_Death.h"
+#include "..\Common\XUI\XUI_DebugOverlay.h"
+#include "..\Common\XUI\XUI_DLCOffers.h"
+#include "..\Common\XUI\XUI_SocialPost.h"
+#include "..\Common\XUI\XUI_Scene_Container.h"
+#include "..\Common\XUI\XUI_Scene_Furnace.h"
+#include "..\Common\XUI\XUI_Scene_Inventory.h"
+#include "..\Common\XUI\XUI_Scene_Trap.h"
+#include "..\Common\XUI\XUI_Control_ComboBox.h"
+#include "..\Common\XUI\XUI_MultiGameInfo.h"
+#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
+#include "..\Common\XUI\XUI_MultiGameCreate.h"
+#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h"
+#include "..\Common\XUI\XUI_SignEntry.h"
+#include "..\Common\XUI\XUI_InGameInfo.h"
+#include "..\Common\XUI\XUI_TrialExitUpsell.h"
+#include "..\Common\XUI\XUI_BasePlayer.h"
+#include "..\Common\XUI\XUI_PartnernetPassword.h"
+#include "..\Common\XUI\XUI_SaveMessage.h"
+#include "..\Common\XUI\XUI_Chat.h"
+#include "..\Common\XUI\XUI_SkinSelect.h"
+#include "..\Common\XUI\XUI_InGameHostOptions.h"
+#include "..\Common\XUI\XUI_InGamePlayerOptions.h"
+#include "..\Common\XUI\XUI_Scene_Enchant.h"
+#include "..\Common\XUI\XUI_Scene_BrewingStand.h"
+#include "..\Common\XUI\XUI_XZP_Icons.h"
+#include "..\Common\XUI\XUI_Controls.h"
+#include "..\Common\XUI\XUI_Scene_Win.h"
+#include "..\Common\XUI\XUI_HUD.h"
+#include "..\Common\XUI\XUI_Scene_Anvil.h"
+#include "..\Common\XUI\XUI_Scene_Trading.h"
+#include "..\Common\XUI\XUI_Teleport.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
-#include <Common/XUI/XUI_DebugItemEditor.h>
+#include "..\Common\XUI\XUI_DebugItemEditor.h"
 #endif
 #ifndef _CONTENT_PACKAGE
-#include <Common/XUI/XUI_DebugSchematicCreator.h>
+#include "..\Common\XUI\XUI_DebugSchematicCreator.h"
 #endif
 
 #include "Xbox_App.h"
diff --git a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
index 6807b9137..04e4a8d5a 100644
--- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
+++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
@@ -4,36 +4,36 @@
 #include "stdafx.h"
 #include <xbdm.h>
 #include <assert.h>
-#include <GameConfig/Minecraft.spa.h>
-#include <MinecraftServer.h>
-#include <LocalPlayer.h>
-#include <Minecraft.World/ItemInstance.h>
-#include <Minecraft.World/MapItem.h>
-#include <Minecraft.World/Recipes.h>
-#include <Minecraft.World/Recipy.h>
-#include <Minecraft.World/Language.h>
-#include <Minecraft.World/StringHelpers.h>
-#include <Minecraft.World/AABB.h>
-#include <Minecraft.World/Vec3.h>
-#include <Minecraft.World/Level.h>
-#include <Minecraft.World/net.minecraft.world.level.tile.h>
-#include <ClientConnection.h>
-#include <User.h>
-#include <Minecraft.World/Socket.h>
-#include <Minecraft.World/ThreadName.h>
-#include <Minecraft.Client/StatsCounter.h>
-#include <ConnectScreen.h>
-#include <Social/SocialManager.h>
-#include <Leaderboards/XboxLeaderboardManager.h>
-#include <Common/XUI/XUI_Scene_Container.h>
-#include <Minecraft.Client/Tesselator.h>
-#include <Minecraft.Client/Options.h>
-#include <Sentient/SentientManager.h>
-#include <Minecraft.World/IntCache.h>
-#include <Textures.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/OldChunkStorage.h>
-//#include <Minecraft.Client/SoundEngine.h>
+#include "GameConfig\Minecraft.spa.h"
+#include "..\MinecraftServer.h"
+#include "..\LocalPlayer.h"
+#include "..\..\Minecraft.World\ItemInstance.h"
+#include "..\..\Minecraft.World\MapItem.h"
+#include "..\..\Minecraft.World\Recipes.h"
+#include "..\..\Minecraft.World\Recipy.h"
+#include "..\..\Minecraft.World\Language.h"
+#include "..\..\Minecraft.World\StringHelpers.h"
+#include "..\..\Minecraft.World\AABB.h"
+#include "..\..\Minecraft.World\Vec3.h"
+#include "..\..\Minecraft.World\Level.h"
+#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "..\ClientConnection.h"
+#include "..\User.h"
+#include "..\..\Minecraft.World\Socket.h"
+#include "..\..\Minecraft.World\ThreadName.h"
+#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\ConnectScreen.h"
+#include "Social\SocialManager.h"
+#include "Leaderboards\XboxLeaderboardManager.h"
+#include "..\Common\XUI\XUI_Scene_Container.h"
+#include "..\..\Minecraft.Client\Tesselator.h"
+#include "..\..\Minecraft.Client\Options.h"
+#include "Sentient\SentientManager.h"
+#include "..\..\Minecraft.World\IntCache.h"
+#include "..\Textures.h"
+#include "..\..\Minecraft.World\compression.h"
+#include "..\..\Minecraft.World\OldChunkStorage.h"
+//#include "..\..\Minecraft.Client\SoundEngine.h"
 
 #include <NuiApi.h>
 
diff --git a/Minecraft.Client/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Xbox/Xbox_UIController.cpp
index 813d70ddb..51d91ca49 100644
--- a/Minecraft.Client/Xbox/Xbox_UIController.cpp
+++ b/Minecraft.Client/Xbox/Xbox_UIController.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Xbox_UIController.h"
-#include <Common/XUI/XUI_Scene_Base.h>
-#include <Common/XUI/XUI_Scene_Win.h>
+#include "..\Common\XUI\XUI_Scene_Base.h"
+#include "..\Common\XUI\XUI_Scene_Win.h"
 
 ConsoleUIController ui;
 
diff --git a/Minecraft.Client/Xbox/Xbox_UIController.h b/Minecraft.Client/Xbox/Xbox_UIController.h
index b95afeda7..2b273ee52 100644
--- a/Minecraft.Client/Xbox/Xbox_UIController.h
+++ b/Minecraft.Client/Xbox/Xbox_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Common/UI/IUIController.h>
+#include "..\Common\UI\IUIController.h"
 
 class ConsoleUIController : public IUIController
 {
diff --git a/Minecraft.Client/ZombieModel.cpp b/Minecraft.Client/ZombieModel.cpp
index 93a3a55c7..648dd09f8 100644
--- a/Minecraft.Client/ZombieModel.cpp
+++ b/Minecraft.Client/ZombieModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ZombieModel.h"
-#include <Minecraft.World/Mth.h>
+#include "..\Minecraft.World\Mth.h"
 #include "ModelPart.h"
 
 ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32)
diff --git a/Minecraft.Client/ZombieRenderer.cpp b/Minecraft.Client/ZombieRenderer.cpp
index 7ad3a8fa4..7fd2d2015 100644
--- a/Minecraft.Client/ZombieRenderer.cpp
+++ b/Minecraft.Client/ZombieRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ZombieModel.h"
 #include "VillagerZombieModel.h"
-#include <Minecraft.World/net.minecraft.world.entity.monster.h>
+#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "ZombieRenderer.h"
 
 ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE);
diff --git a/Minecraft.Client/glWrapper.cpp b/Minecraft.Client/glWrapper.cpp
index bf1c164c1..5e0fab2c6 100644
--- a/Minecraft.Client/glWrapper.cpp
+++ b/Minecraft.Client/glWrapper.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include <Minecraft.World/FloatBuffer.h>
-#include <Minecraft.World/IntBuffer.h>
-#include <Minecraft.World/ByteBuffer.h>
+#include "..\Minecraft.World\FloatBuffer.h"
+#include "..\Minecraft.World\IntBuffer.h"
+#include "..\Minecraft.World\ByteBuffer.h"
 
 void glViewport(int x, int y, int w, int h)
 {
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index 070e11d1f..4c8bf5d69 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -118,7 +118,7 @@ typedef XNKID SessionID;
 typedef XUID GameSessionUID;
 #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
 
-#include <Minecraft.Client/xbox/network/extra.h>
+#include "..\Minecraft.Client\xbox\network\extra.h"
 #else
 #include "extraX64.h"
 #endif
@@ -159,48 +159,48 @@ typedef XUID GameSessionUID;
 #include <xparty.h>
 #endif
 
-#include <Minecraft.World/Definitions.h>
-#include <Minecraft.World/Class.h>
-#include <Minecraft.World/ArrayWithLength.h>
-#include <Minecraft.World/SharedConstants.h>
-#include <Minecraft.World/Random.h>
-#include <Minecraft.World/compression.h>
-#include <Minecraft.World/PerformanceTimer.h>
+#include "..\Minecraft.World\Definitions.h"
+#include "..\Minecraft.World\class.h"
+#include "..\Minecraft.World\ArrayWithLength.h"
+#include "..\Minecraft.World\SharedConstants.h"
+#include "..\Minecraft.World\Random.h"
+#include "..\Minecraft.World\compression.h"
+#include "..\Minecraft.World\PerformanceTimer.h"
 
 #ifdef _XBOX
-	#include <xbox/4JLibs/inc/4J_Input.h>
-	#include <xbox/4JLibs/inc/4J_Profile.h>
-	#include <xbox/4JLibs/inc/4J_Render.h>
-	#include <xbox/4JLibs/inc/4J_xtms.h>
-	#include <xbox/4JLibs/inc/4J_Storage.h>
+	#include "xbox\4JLibs\inc\4J_Input.h"
+	#include "xbox\4JLibs\inc\4J_Profile.h"
+	#include "xbox\4JLibs\inc\4J_Render.h"
+	#include "xbox\4JLibs\inc\4J_XTMS.h"
+	#include "xbox\4JLibs\inc\4J_Storage.h"
 #elif defined (__PS3__)
 
-	#include <PS3/4JLibs/inc/4J_Input.h>
-	#include <PS3/4JLibs/inc/4J_Profile.h>
-	#include <PS3/4JLibs/inc/4J_Render.h>
-	#include <PS3/4JLibs/inc/4J_Storage.h>
+	#include "PS3\4JLibs\inc\4J_Input.h"
+	#include "PS3\4JLibs\inc\4J_Profile.h"
+	#include "PS3\4JLibs\inc\4J_Render.h"
+	#include "PS3\4JLibs\inc\4J_Storage.h"
 #elif defined _DURANGO
-	#include <Durango/4JLibs/inc/4J_Input.h>
-	#include <Durango/4JLibs/inc/4J_Profile.h>
-	#include <Durango/4JLibs/inc/4J_Render.h>
-	#include <Durango/4JLibs/inc/4J_Storage.h>
+	#include "Durango\4JLibs\inc\4J_Input.h"
+	#include "Durango\4JLibs\inc\4J_Profile.h"
+	#include "Durango\4JLibs\inc\4J_Render.h"
+	#include "Durango\4JLibs\inc\4J_Storage.h"
 #elif defined _WINDOWS64
 	#include <Xinput.h>
-	#include <Windows64/4JLibs/inc/4J_Input.h>
-	#include <Windows64/4JLibs/inc/4J_Profile.h>
-	#include <Windows64/4JLibs/inc/4J_Render.h>
-	#include <Windows64/4JLibs/inc/4J_Storage.h>
-	#include <Windows64/KeyboardMouseInput.h>
+	#include "Windows64\4JLibs\inc\4J_Input.h"
+	#include "Windows64\4JLibs\inc\4J_Profile.h"
+	#include "Windows64\4JLibs\inc\4J_Render.h"
+	#include "Windows64\4JLibs\inc\4J_Storage.h"
+	#include "Windows64\KeyboardMouseInput.h"
 #elif defined __PSVITA__
-	#include <PSVita/4JLibs/inc/4J_Input.h>	
-	#include <PSVita/4JLibs/inc/4J_Profile.h>
-	#include <PSVita/4JLibs/inc/4J_Render.h>
-	#include <PSVita/4JLibs/inc/4J_Storage.h>
+	#include "PSVita\4JLibs\inc\4J_Input.h"	
+	#include "PSVita\4JLibs\inc\4J_Profile.h"
+	#include "PSVita\4JLibs\inc\4J_Render.h"
+	#include "PSVita\4JLibs\inc\4J_Storage.h"
 #else
-	#include <Orbis/4JLibs/inc/4J_Input.h>	
-	#include <Orbis/4JLibs/inc/4J_Profile.h>
-	#include <Orbis/4JLibs/inc/4J_Render.h>
-	#include <Orbis/4JLibs/inc/4J_Storage.h>
+	#include "Orbis\4JLibs\inc\4J_Input.h"	
+	#include "Orbis\4JLibs\inc\4J_Profile.h"
+	#include "Orbis\4JLibs\inc\4J_Render.h"
+	#include "Orbis\4JLibs\inc\4J_Storage.h"
 #endif
 
 #include "Textures.h"
@@ -214,139 +214,139 @@ typedef XUID GameSessionUID;
 #include "stubs.h"
 #include "BufferedImage.h"
 
-#include <Common/Network/GameNetworkManager.h>
+#include "Common\Network\GameNetworkManager.h"
 
 #ifdef _XBOX
-#include <Common/XUI/XUI_Helper.h>
-#include <Common/XUI/XUI_Scene_Base.h>
+#include "Common\XUI\XUI_Helper.h"
+#include "Common\XUI\XUI_Scene_Base.h"
 #endif
 
-#include <Common/App_Defines.h>
-#include <Common/UI/UIEnums.h>
-#include <Common/UI/UIStructs.h>
+#include "Common\App_defines.h"
+#include "Common\UI\UIEnums.h"
+#include "Common\UI\UIStructs.h"
 // #ifdef _XBOX
-#include <Common/App_enums.h>
-#include <Common/Tutorial/TutorialEnum.h>
-#include <Common/App_structs.h>
+#include "Common\App_enums.h"
+#include "Common\Tutorial\TutorialEnum.h"
+#include "Common\App_structs.h"
 //#endif
 
-#include <Common/Consoles_App.h>
-#include <Common/Minecraft_Macros.h>
-#include <Common/BuildVer.h>
+#include "Common\Consoles_App.h"
+#include "Common\Minecraft_Macros.h"
+#include "Common\BuildVer.h"
 
 #ifdef _XBOX
-	#include <Xbox/Xbox_App.h>
-	#include <Xbox/Sentient/MinecraftTelemetry.h>
-	#include <Xbox/Sentient/DynamicConfigurations.h>
-	#include <XboxMedia/strings.h>
-	#include <Xbox/Sentient/SentientTelemetryCommon.h>
-	#include <Xbox/Sentient/Include/SenClientStats.h>
-	#include <Xbox/GameConfig/Minecraft.spa.h>
-	#include <XboxMedia/4J_strings.h>
-	#include <Xbox/XML/ATGXmlParser.h>
-	#include <Xbox/Leaderboards/XboxLeaderboardManager.h>
-	#include <Xbox/Social/SocialManager.h>
-	#include <Xbox/Audio/SoundEngine.h>
-	#include <Xbox/Xbox_UIController.h>
+	#include "Xbox\Xbox_App.h"
+	#include "Xbox\Sentient\MinecraftTelemetry.h"
+	#include "Xbox\Sentient\DynamicConfigurations.h"
+	#include "XboxMedia\strings.h"
+	#include "Xbox\Sentient\SentientTelemetryCommon.h"
+	#include "Xbox\Sentient\Include\SenClientStats.h"
+	#include "Xbox\GameConfig\Minecraft.spa.h"
+	#include "XboxMedia\4J_strings.h"
+	#include "Xbox\XML\ATGXmlParser.h"
+	#include "Xbox\Leaderboards\XboxLeaderboardManager.h"
+	#include "Xbox\Social\SocialManager.h"
+	#include "Xbox\Audio\SoundEngine.h"
+	#include "Xbox\Xbox_UIController.h"
 
 #elif defined (__PS3__)
 	#include "extraX64client.h"
-	#include <PS3/Sentient/MinecraftTelemetry.h>
-	#include <PS3/Sentient/DynamicConfigurations.h>
-	#include <PS3/Sentient/SentientTelemetryCommon.h>
-	#include <PS3Media/strings.h>
-	#include <PS3/PS3_App.h>
-	#include <PS3/GameConfig/Minecraft.spa.h>
-	#include <PS3Media/4J_strings.h>
-	#include <PS3/XML/ATGXmlParser.h>
-	#include <PS3/Social/SocialManager.h>
-	#include <Common/Audio/SoundEngine.h>
-	#include <PS3/Iggy/include/iggy.h>
-	#include <PS3/Iggy/gdraw/gdraw_ps3gcm.h>
-	#include <PS3/PS3_UIController.h>
+	#include "PS3\Sentient\MinecraftTelemetry.h"
+	#include "PS3\Sentient\DynamicConfigurations.h"
+	#include "PS3\Sentient\SentientTelemetryCommon.h"
+	#include "PS3Media\strings.h"
+	#include "PS3\PS3_App.h"
+	#include "PS3\GameConfig\Minecraft.spa.h"
+	#include "PS3Media\4J_strings.h"
+	#include "PS3\XML\ATGXmlParser.h"
+	#include "PS3\Social\SocialManager.h"
+	#include "Common\Audio\SoundEngine.h"
+	#include "PS3\Iggy\include\iggy.h"
+	#include "PS3\Iggy\gdraw\gdraw_ps3gcm.h"
+	#include "PS3\PS3_UIController.h"
 #elif defined _DURANGO
-	#include <Durango/Sentient/MinecraftTelemetry.h>
-	#include <DurangoMedia/strings.h>
-	#include <Durango/Durango_App.h>
-	#include <Durango/Sentient/DynamicConfigurations.h>	
-	#include <Durango/Sentient/TelemetryEnum.h>
-	#include <Durango/Sentient/SentientTelemetryCommon.h>
-	#include <Durango/PresenceIds.h>
-	#include <DurangoMedia/4J_strings.h>
-	#include <Durango/XML/ATGXmlParser.h>
-	#include <Durango/Social/SocialManager.h>
-#include <Common/Audio/SoundEngine.h>
-	#include <Durango/Iggy/include/iggy.h>
-	#include <Durango/Iggy/gdraw/gdraw_d3d11.h>
-	#include <Durango/Durango_UIController.h>
+	#include "Durango\Sentient\MinecraftTelemetry.h"
+	#include "DurangoMedia\strings.h"
+	#include "Durango\Durango_App.h"
+	#include "Durango\Sentient\DynamicConfigurations.h"	
+	#include "Durango\Sentient\TelemetryEnum.h"
+	#include "Durango\Sentient\SentientTelemetryCommon.h"
+	#include "Durango\PresenceIds.h"
+	#include "DurangoMedia\4J_strings.h"
+	#include "Durango\XML\ATGXmlParser.h"
+	#include "Durango\Social\SocialManager.h"
+#include "Common\Audio\SoundEngine.h"
+	#include "Durango\Iggy\include\iggy.h"
+	#include "Durango\Iggy\gdraw\gdraw_d3d11.h"
+	#include "Durango\Durango_UIController.h"
 #elif defined _WINDOWS64
-	#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>
+	#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
-	#include <PSVita/Sentient/SentientManager.h>
-	#include <PSVita/Sentient/MinecraftTelemetry.h>
-	#include <PSVita/Sentient/DynamicConfigurations.h>
-	#include <PSVita/GameConfig/Minecraft.spa.h>
-	#include <PSVita/XML/ATGXmlParser.h>
-	#include <PSVita/Social/SocialManager.h>
-	#include <Common/Audio/SoundEngine.h>
-	#include <PSVita/Iggy/include/iggy.h>
-	#include <PSVita/Iggy/gdraw/gdraw_psp2.h>
-	#include <PSVita/PSVita_UIController.h>
+	#include "PSVita\PSVita_App.h"
+	#include "PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
+	#include "PSVita\Sentient\SentientManager.h"
+	#include "PSVita\Sentient\MinecraftTelemetry.h"
+	#include "PSVita\Sentient\DynamicConfigurations.h"
+	#include "PSVita\GameConfig\Minecraft.spa.h"
+	#include "PSVita\XML\ATGXmlParser.h"
+	#include "PSVita\Social\SocialManager.h"
+	#include "Common\Audio\SoundEngine.h"
+	#include "PSVita\Iggy\include\iggy.h"
+	#include "PSVita\Iggy\gdraw\gdraw_psp2.h"
+	#include "PSVita\PSVita_UIController.h"
 #else
-	#include <Orbis/Sentient/MinecraftTelemetry.h>
-	#include <OrbisMedia/strings.h>
-	#include <Orbis/Orbis_App.h>
-	#include <Orbis/Sentient/SentientTelemetryCommon.h>
-	#include <Orbis/Sentient/DynamicConfigurations.h>
-	#include <Orbis/GameConfig/Minecraft.spa.h>
-	#include <OrbisMedia/4J_strings.h>
-	#include <Orbis/XML/ATGXmlParser.h>	
-	#include <Windows64/Social/SocialManager.h>
-	#include <Common/Audio/SoundEngine.h>
-	#include <Orbis/Iggy/include/iggy.h>
-	#include <Orbis/Iggy/gdraw/gdraw_orbis.h>
-	#include <Orbis/Orbis_UIController.h>
+	#include "Orbis\Sentient\MinecraftTelemetry.h"
+	#include "OrbisMedia\strings.h"
+	#include "Orbis\Orbis_App.h"
+	#include "Orbis\Sentient\SentientTelemetryCommon.h"
+	#include "Orbis\Sentient\DynamicConfigurations.h"
+	#include "Orbis\GameConfig\Minecraft.spa.h"
+	#include "OrbisMedia\4J_strings.h"
+	#include "Orbis\XML\ATGXmlParser.h"	
+	#include "Windows64\Social\SocialManager.h"
+	#include "Common\Audio\SoundEngine.h"
+	#include "Orbis\Iggy\include\iggy.h"
+	#include "Orbis\Iggy\gdraw\gdraw_orbis.h"
+	#include "Orbis\Orbis_UIController.h"
 #endif
 
 #ifdef _XBOX
-#include <Common/XUI/XUI_CustomMessages.h>
-#include <Common/XUI/XUI_Scene_Inventory_Creative.h>
-#include <Common/XUI/XUI_FullscreenProgress.h>
-#include <Common/XUI/XUI_ConnectingProgress.h>
-#include <Common/XUI/XUI_Scene_CraftingPanel.h>
-#include <Common/XUI/XUI_TutorialPopup.h>
-#include <Common/XUI/XUI_PauseMenu.h>
+#include "Common\XUI\XUI_CustomMessages.h"
+#include "Common\XUI\XUI_Scene_Inventory_Creative.h"
+#include "Common\XUI\XUI_FullscreenProgress.h"
+#include "Common\XUI\XUI_ConnectingProgress.h"
+#include "Common\XUI\XUI_Scene_CraftingPanel.h"
+#include "Common\XUI\XUI_TutorialPopup.h"
+#include "Common\XUI\XUI_PauseMenu.h"
 #endif
-#include <Common/ConsoleGameMode.h>
-#include <Common/Console_Debug_enum.h>
-#include <Common/Console_Awards_enum.h>
-#include <Common/Tutorial/TutorialMode.h>
-#include <Common/Tutorial/Tutorial.h>
-#include <Common/Tutorial/FullTutorialMode.h>
-#include <Common/Trial/TrialMode.h>
-#include <Common/GameRules/ConsoleGameRules.h>
-#include <Common/GameRules/ConsoleSchematicFile.h>
-#include <Common/Colours/ColourTable.h>
-#include <Common/DLC/DLCSkinFile.h>
-#include <Common/DLC/DLCManager.h>
-#include <Common/DLC/DLCPack.h>
-#include <Common/Telemetry/TelemetryManager.h>
+#include "Common\ConsoleGameMode.h"
+#include "Common\Console_Debug_enum.h"
+#include "Common\Console_Awards_enum.h"
+#include "Common\Tutorial\TutorialMode.h"
+#include "Common\Tutorial\Tutorial.h"
+#include "Common\Tutorial\FullTutorialMode.h"
+#include "Common\Trial\TrialMode.h"
+#include "Common\GameRules\ConsoleGameRules.h"
+#include "Common\GameRules\ConsoleSchematicFile.h"
+#include "Common\Colours\ColourTable.h"
+#include "Common\DLC\DLCSkinFile.h"
+#include "Common\DLC\DLCManager.h"
+#include "Common\DLC\DLCPack.h"
+#include "Common\Telemetry\TelemetryManager.h"
 
 #ifdef _XBOX
-//#include <Xbox/Xbox_App.h>
+//#include "Xbox\Xbox_App.h"
 #elif !defined(__PS3__)
 #include "extraX64client.h"
 #endif
diff --git a/Minecraft.Client/stubs.cpp b/Minecraft.Client/stubs.cpp
index cc92ff7dc..16215ba2f 100644
--- a/Minecraft.Client/stubs.cpp
+++ b/Minecraft.Client/stubs.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #ifdef _WINDOWS64
-#include <Windows64/KeyboardMouseInput.h>
+#include "Windows64\KeyboardMouseInput.h"
 
 int Mouse::getX()
 {
diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp
index 3bc7915ed..114b200b9 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.level.tile.h"
 #include "net.minecraft.world.entity.player.h"
diff --git a/Minecraft.World/Arrow.cpp b/Minecraft.World/Arrow.cpp
index 08801ca56..743f966be 100644
--- a/Minecraft.World/Arrow.cpp
+++ b/Minecraft.World/Arrow.cpp
@@ -8,8 +8,8 @@
 #include "net.minecraft.world.damagesource.h"
 #include "net.minecraft.world.item.enchantment.h"
 #include "net.minecraft.network.packet.h"
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.Client/PlayerConnection.h>
+#include "..\Minecraft.Client\ServerPlayer.h"
+#include "..\Minecraft.Client\PlayerConnection.h"
 #include "com.mojang.nbt.h"
 #include "Arrow.h"
 
diff --git a/Minecraft.World/Biome.cpp b/Minecraft.World/Biome.cpp
index f69432555..169db77e6 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/BiomeCache.h b/Minecraft.World/BiomeCache.h
index bae405df5..bf509f544 100644
--- a/Minecraft.World/BiomeCache.h
+++ b/Minecraft.World/BiomeCache.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\JavaIntHash.h"
 
 class BiomeCache
 {
diff --git a/Minecraft.World/BiomeSource.cpp b/Minecraft.World/BiomeSource.cpp
index 8d871a85a..8e2a56809 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 5726edc7f..d87a83b2d 100644
--- a/Minecraft.World/Blaze.cpp
+++ b/Minecraft.World/Blaze.cpp
@@ -9,7 +9,7 @@
 #include "net.minecraft.world.entity.monster.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 e31de81d0..a3bd7bee1 100644
--- a/Minecraft.World/BucketItem.cpp
+++ b/Minecraft.World/BucketItem.cpp
@@ -12,10 +12,10 @@
 #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.World/ChatPacket.h>
+#include "..\Minecraft.Client\LocalPlayer.h"
+#include "..\Minecraft.Client\ServerPlayer.h"
+#include "..\Minecraft.Client\PlayerConnection.h"
+#include "..\Minecraft.World\ChatPacket.h"
 #include "SoundTypes.h"
 
 BucketItem::BucketItem(int id, int content) : Item( id )
diff --git a/Minecraft.World/C4JThread.cpp b/Minecraft.World/C4JThread.cpp
index 8fbed7455..4b9760c17 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 34f748d6c..f7a8d0445 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 bab6fb63c..d9396c43c 100644
--- a/Minecraft.World/CaveSpider.cpp
+++ b/Minecraft.World/CaveSpider.cpp
@@ -5,7 +5,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 5f4f6c0d6..5f4cf2a73 100644
--- a/Minecraft.World/Chicken.cpp
+++ b/Minecraft.World/Chicken.cpp
@@ -8,7 +8,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 a891412c9..afe0544d2 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/Command.cpp b/Minecraft.World/Command.cpp
index 543a447fa..bf546f6ea 100644
--- a/Minecraft.World/Command.cpp
+++ b/Minecraft.World/Command.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "net.minecraft.commands.h"
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/PlayerList.h>
-#include <Minecraft.Client/ServerPlayer.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
+#include "..\Minecraft.Client\PlayerList.h"
+#include "..\Minecraft.Client\ServerPlayer.h"
 #include "Command.h"
 
 AdminLogCommand *Command::logger;
diff --git a/Minecraft.World/CommandBlockEntity.cpp b/Minecraft.World/CommandBlockEntity.cpp
index 779a59663..1c518f4fd 100644
--- a/Minecraft.World/CommandBlockEntity.cpp
+++ b/Minecraft.World/CommandBlockEntity.cpp
@@ -2,7 +2,7 @@
 #include "net.minecraft.network.packet.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.commands.h"
-#include <Minecraft.Client/MinecraftServer.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
 #include "CommandBlockEntity.h"
 
 CommandBlockEntity::CommandBlockEntity()
diff --git a/Minecraft.World/CompassItem.cpp b/Minecraft.World/CompassItem.cpp
index 453c32cf1..57ad65d04 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/CompressedTileStorage.cpp b/Minecraft.World/CompressedTileStorage.cpp
index 5d3b53f5e..12c1ba3b7 100644
--- a/Minecraft.World/CompressedTileStorage.cpp
+++ b/Minecraft.World/CompressedTileStorage.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef __PS3__
-#include <SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.h>
+#include "..\SPU_Tasks\CompressedTileStorage_compress\CompressedTileStorage_compress.h"
 #include "C4JSpursJob.h"
 static const int sc_maxCompressTiles = 64;
 static CompressedTileStorage_compress_dataIn g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16)));
diff --git a/Minecraft.World/Connection.cpp b/Minecraft.World/Connection.cpp
index 3ecaddebc..09f72be09 100644
--- a/Minecraft.World/Connection.cpp
+++ b/Minecraft.World/Connection.cpp
@@ -4,7 +4,7 @@
 #include "Connection.h"
 #include "ThreadName.h"
 #include "compression.h"
-#include <Minecraft.Client/PS3/PS3Extras/ShutdownManager.h>
+#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
 
 // This should always be enabled, except for debugging use
 #ifndef _DEBUG
diff --git a/Minecraft.World/ConsoleSaveFileOriginal.cpp b/Minecraft.World/ConsoleSaveFileOriginal.cpp
index e08e168c0..c07808d42 100644
--- a/Minecraft.World/ConsoleSaveFileOriginal.cpp
+++ b/Minecraft.World/ConsoleSaveFileOriginal.cpp
@@ -4,13 +4,13 @@
 #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.World/net.minecraft.world.level.h>
-#include <Minecraft.World/LevelData.h>
-#include <Minecraft.Client/Common/GameRules/LevelGenerationOptions.h>
-#include <Minecraft.World/net.minecraft.world.level.chunk.storage.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.World\net.minecraft.world.level.chunk.storage.h"
 
 
 #ifdef _XBOX
diff --git a/Minecraft.World/ContainerMenu.cpp b/Minecraft.World/ContainerMenu.cpp
index 973922ec2..b1fd4d6bd 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 590baf67e..25bd579c5 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 "..\Minecraft.World\SharedConstants.h"
 
 class Mob;
 
diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp
index f113fc373..05e701027 100644
--- a/Minecraft.World/Cow.cpp
+++ b/Minecraft.World/Cow.cpp
@@ -11,7 +11,7 @@
 #include "net.minecraft.world.entity.monster.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 52033dad5..29be2c0ca 100644
--- a/Minecraft.World/Creeper.cpp
+++ b/Minecraft.World/Creeper.cpp
@@ -15,7 +15,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 6c44d364b..443bd1bc7 100644
--- a/Minecraft.World/Dimension.cpp
+++ b/Minecraft.World/Dimension.cpp
@@ -11,8 +11,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"
 
 const float Dimension::MOON_BRIGHTNESS_PER_PHASE[8] = {1.0f, 0.75f, 0.5f, 0.25f, 0, 0.25f, 0.5f, 0.75f};
 
diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp
index f14e7ced8..6e50fd20d 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/EffectCommand.cpp b/Minecraft.World/EffectCommand.cpp
index 78cb02500..5d708db8a 100644
--- a/Minecraft.World/EffectCommand.cpp
+++ b/Minecraft.World/EffectCommand.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "net.minecraft.commands.common.h"
-#include <Minecraft.Client/MinecraftServer.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
 
 EGameCommand EffectCommand::getId()
 {
diff --git a/Minecraft.World/EnchantItemCommand.cpp b/Minecraft.World/EnchantItemCommand.cpp
index 741b1ef8d..7ec57563c 100644
--- a/Minecraft.World/EnchantItemCommand.cpp
+++ b/Minecraft.World/EnchantItemCommand.cpp
@@ -2,7 +2,7 @@
 #include "net.minecraft.network.packet.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.item.enchantment.h"
-#include <Minecraft.Client/ServerPlayer.h>
+#include "..\Minecraft.Client\ServerPlayer.h"
 #include "EnchantItemCommand.h"
 
 EGameCommand EnchantItemCommand::getId()
diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp
index 975bb90df..2dc0c434a 100644
--- a/Minecraft.World/EnderDragon.cpp
+++ b/Minecraft.World/EnderDragon.cpp
@@ -9,7 +9,7 @@
 #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"
diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp
index 21c8e665f..d099911c0 100644
--- a/Minecraft.World/EnderMan.cpp
+++ b/Minecraft.World/EnderMan.cpp
@@ -9,7 +9,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"
 
 AttributeModifier *EnderMan::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_ENDERMAN_ATTACKSPEED, 6.2f, AttributeModifier::OPERATION_ADDITION))->setSerialize(false);
diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp
index 0ef9b12c1..e45160578 100644
--- a/Minecraft.World/Entity.cpp
+++ b/Minecraft.World/Entity.cpp
@@ -18,12 +18,21 @@
 #include "EntityPos.h"
 #include "Entity.h"
 #include "SoundTypes.h"
+<<<<<<< HEAD
 #include <minecraft.Client/HumanoidModel.h>
 #include <Minecraft.Client/MinecraftServer.h>
 #include <Minecraft.Client/MultiPlayerLevel.h>
 #include <Minecraft.Client/MultiPlayerLocalPlayer.h>
 #include <Minecraft.Client/ServerLevel.h>
 #include <Minecraft.Client/PlayerList.h>
+=======
+#include "..\minecraft.Client\HumanoidModel.h"
+#include "..\Minecraft.Client\MinecraftServer.h"
+#include "..\Minecraft.Client\MultiPlayerLevel.h"
+#include "..\Minecraft.Client\MultiplayerLocalPlayer.h"
+#include "..\Minecraft.Client\ServerLevel.h"
+#include "..\Minecraft.Client\PlayerList.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 
 const wstring Entity::RIDING_TAG = L"Riding";
 
diff --git a/Minecraft.World/EntityHorse.cpp b/Minecraft.World/EntityHorse.cpp
index 4e7bd2895..2d67d21bd 100644
--- a/Minecraft.World/EntityHorse.cpp
+++ b/Minecraft.World/EntityHorse.cpp
@@ -13,8 +13,8 @@
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.inventory.h"
 #include "net.minecraft.world.phys.h"
-#include <Minecraft.Client/Textures.h>
-#include <Minecraft.Client/Minecraft.h>
+#include "..\Minecraft.Client\Textures.h"
+#include "..\Minecraft.Client\Minecraft.h"
 #include "BasicTypeContainers.h"
 #include "EntityHorse.h"
 
diff --git a/Minecraft.World/ExperienceCommand.cpp b/Minecraft.World/ExperienceCommand.cpp
index 2672b2af1..9a59d71a0 100644
--- a/Minecraft.World/ExperienceCommand.cpp
+++ b/Minecraft.World/ExperienceCommand.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "net.minecraft.commands.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.h"
 #include "ExperienceCommand.h"
 
diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp
index 7358defc4..dfb4b961c 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 e5fb3c30b..276bf9298 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/GenericStats.h b/Minecraft.World/GenericStats.h
index ac11e40cc..541424db0 100644
--- a/Minecraft.World/GenericStats.h
+++ b/Minecraft.World/GenericStats.h
@@ -3,9 +3,9 @@
 #include "Stat.h"
 #include "Stats.h"
 
-//#include <DamageSource.h>
+//#include "DamageSource.h"
 
-//#include <Minecraft.Client/Common/Console_Awards_enum.h>
+//#include "..\Minecraft.Client\Common\Console_Awards_enum.h"
 
 /**
 	4J-JEV:
diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp
index 27adbcea3..f0817791c 100644
--- a/Minecraft.World/Ghast.cpp
+++ b/Minecraft.World/Ghast.cpp
@@ -11,7 +11,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 b66a6df04..dbb790bf0 100644
--- a/Minecraft.World/Giant.cpp
+++ b/Minecraft.World/Giant.cpp
@@ -3,7 +3,7 @@
 #include "net.minecraft.world.entity.ai.attributes.h"
 #include "net.minecraft.world.entity.monster.h"
 #include "Giant.h"
-#include <Minecraft.Client/Textures.h>
+#include "..\Minecraft.Client\Textures.h"
 
 
 
diff --git a/Minecraft.World/GiveItemCommand.cpp b/Minecraft.World/GiveItemCommand.cpp
index e20e2920e..b3cbff4f1 100644
--- a/Minecraft.World/GiveItemCommand.cpp
+++ b/Minecraft.World/GiveItemCommand.cpp
@@ -3,7 +3,7 @@
 #include "net.minecraft.world.entity.item.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.network.packet.h"
-#include <Minecraft.Client/ServerPlayer.h>
+#include "..\Minecraft.Client\ServerPlayer.h"
 #include "GiveItemCommand.h"
 
 EGameCommand GiveItemCommand::getId()
diff --git a/Minecraft.World/GrassTile.cpp b/Minecraft.World/GrassTile.cpp
index 745a3d9e0..68e7c2332 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 1f909296f..85e2a25ae 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 d22ae4d86..21982995d 100644
--- a/Minecraft.World/LavaSlime.cpp
+++ b/Minecraft.World/LavaSlime.cpp
@@ -4,7 +4,7 @@
 #include "net.minecraft.world.entity.ai.attributes.h"
 #include "net.minecraft.world.entity.monster.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 e24489c38..956a8917b 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 49d62c91d..684618a78 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 b4b6ca40e..f9c383ed6 100644
--- a/Minecraft.World/Level.cpp
+++ b/Minecraft.World/Level.cpp
@@ -29,16 +29,16 @@
 
 #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/MinecraftServer.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\MinecraftServer.h"
 
 
 DWORD Level::tlsIdx = TlsAlloc();
diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h
index 3d341f42e..045cfdb87 100644
--- a/Minecraft.World/Level.h
+++ b/Minecraft.World/Level.h
@@ -11,7 +11,7 @@ using namespace std;
 #include "C4JThread.h"
 
 #ifdef __PSVITA__
-#include <Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h>
+#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomSet.h"
 #endif
 
 // 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites,
diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp
index 94ac0582d..920fdfc12 100644
--- a/Minecraft.World/LevelChunk.cpp
+++ b/Minecraft.World/LevelChunk.cpp
@@ -12,10 +12,10 @@
 #include "BlockReplacements.h"
 #include "LevelChunk.h"
 #include "BasicTypeContainers.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"
 #include "ItemEntity.h"
 #include "Minecart.h"
 
diff --git a/Minecraft.World/LightningBolt.cpp b/Minecraft.World/LightningBolt.cpp
index 12af563f3..7f32c8ec8 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/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp
index 5cf8be079..5f8a3dd1c 100644
--- a/Minecraft.World/LivingEntity.cpp
+++ b/Minecraft.World/LivingEntity.cpp
@@ -24,9 +24,9 @@
 #include "net.minecraft.world.scores.h"
 #include "com.mojang.nbt.h"
 #include "LivingEntity.h"
-#include <Minecraft.Client/Textures.h>
-#include <Minecraft.Client/ServerLevel.h>
-#include <Minecraft.Client/EntityTracker.h>
+#include "..\Minecraft.Client\Textures.h"
+#include "..\Minecraft.Client\ServerLevel.h"
+#include "..\Minecraft.Client\EntityTracker.h"
 #include "SoundTypes.h"
 #include "BasicTypeContainers.h"
 #include "ParticleTypes.h"
diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp
index cecc39538..6304aa624 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/Material.cpp b/Minecraft.World/Material.cpp
index 840d7706c..9e201ad54 100644
--- a/Minecraft.World/Material.cpp
+++ b/Minecraft.World/Material.cpp
@@ -4,7 +4,7 @@
 #include "GasMaterial.h"
 #include "LiquidMaterial.h"
 #include "PortalMaterial.h"
-#include <WebMaterial.h>// 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing
+#include "WebMaterial.h"// 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing
 
 Material *Material::air = NULL;
 Material *Material::grass = NULL;
diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp
index 23fcbb962..48787f55c 100644
--- a/Minecraft.World/Minecart.cpp
+++ b/Minecraft.World/Minecart.cpp
@@ -9,8 +9,8 @@
 #include "net.minecraft.world.entity.animal.h"
 #include "net.minecraft.world.item.h"
 #include "net.minecraft.world.damagesource.h"
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/ServerLevel.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
+#include "..\Minecraft.Client\ServerLevel.h"
 #include "com.mojang.nbt.h"
 #include "Minecart.h"
 #include "SharedConstants.h"
diff --git a/Minecraft.World/Minecraft.World.cpp b/Minecraft.World/Minecraft.World.cpp
index fa15d4e0e..1ee6eb47c 100644
--- a/Minecraft.World/Minecraft.World.cpp
+++ b/Minecraft.World/Minecraft.World.cpp
@@ -15,7 +15,7 @@
 #include "net.minecraft.world.effect.h"
 
 #include "Minecraft.World.h"
-#include <Minecraft.Client/ServerLevel.h>
+#include "..\Minecraft.Client\ServerLevel.h"
 
 #ifdef _DURANGO
 #include "DurangoStats.h"
diff --git a/Minecraft.World/Mob.cpp b/Minecraft.World/Mob.cpp
index fb2e392a7..cac25ddbe 100644
--- a/Minecraft.World/Mob.cpp
+++ b/Minecraft.World/Mob.cpp
@@ -19,11 +19,11 @@
 #include "net.minecraft.world.item.alchemy.h"
 #include "net.minecraft.world.item.enchantment.h"
 #include "net.minecraft.world.h"
-#include <Minecraft.Client/ServerLevel.h>
-#include <Minecraft.Client/EntityTracker.h>
+#include "..\Minecraft.Client\ServerLevel.h"
+#include "..\Minecraft.Client\EntityTracker.h"
 #include "com.mojang.nbt.h"
 #include "Mob.h"
-#include <Minecraft.Client/Textures.h>
+#include "..\Minecraft.Client\Textures.h"
 #include "SoundTypes.h"
 #include "BasicTypeContainers.h"
 #include "ParticleTypes.h"
diff --git a/Minecraft.World/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp
index 275692a50..8cd60e922 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/MobSpawner.h b/Minecraft.World/MobSpawner.h
index 8f030feb1..452ddcc43 100644
--- a/Minecraft.World/MobSpawner.h
+++ b/Minecraft.World/MobSpawner.h
@@ -3,7 +3,7 @@
 #include "Mob.h"
 
 #ifdef __PSVITA__
-#include <Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h>
+#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomMap.h"
 #endif
 
 class Player;
diff --git a/Minecraft.World/Monster.cpp b/Minecraft.World/Monster.cpp
index ebea58e25..174a706cb 100644
--- a/Minecraft.World/Monster.cpp
+++ b/Minecraft.World/Monster.cpp
@@ -10,7 +10,7 @@
 #include "net.minecraft.world.item.enchantment.h"
 #include "Monster.h"
 
-#include <Minecraft.Client/Minecraft.h>
+#include "..\Minecraft.Client\Minecraft.h"
 
 
 Monster::Monster(Level *level) : PathfinderMob( level )
diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp
index 14293c554..a29700338 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 719b162bb..0f88c8435 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/Ocelot.cpp b/Minecraft.World/Ocelot.cpp
index 3d54202fd..50285682a 100644
--- a/Minecraft.World/Ocelot.cpp
+++ b/Minecraft.World/Ocelot.cpp
@@ -14,9 +14,9 @@
 #include "net.minecraft.world.phys.h"
 #include "SynchedEntityData.h"
 #include "StringHelpers.h"
-#include <Minecraft.Client/Textures.h>
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/MultiPlayerLocalPlayer.h>
+#include "..\Minecraft.Client\Textures.h"
+#include "..\Minecraft.Client\Minecraft.h"
+#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
 #include "GenericStats.h"
 #include "Ocelot.h"
 
diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp
index 3555145eb..3c05f3578 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/Packet.cpp b/Minecraft.World/Packet.cpp
index 192cbf276..f1630db5f 100644
--- a/Minecraft.World/Packet.cpp
+++ b/Minecraft.World/Packet.cpp
@@ -8,8 +8,8 @@
 #include "com.mojang.nbt.h"
 
 #ifndef _CONTENT_PACKAGE
-#include <Minecraft.Client/Minecraft.h>
-#include <Minecraft.Client/Gui.h>
+#include "..\Minecraft.Client\Minecraft.h"
+#include "..\Minecraft.Client\Gui.h"
 #endif
 
 void Packet::staticCtor()
diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp
index b87d06fcb..cc042f586 100644
--- a/Minecraft.World/Pig.cpp
+++ b/Minecraft.World/Pig.cpp
@@ -14,7 +14,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 68a050f6c..7a736c9ad 100644
--- a/Minecraft.World/PigZombie.cpp
+++ b/Minecraft.World/PigZombie.cpp
@@ -11,7 +11,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"
 
 AttributeModifier *PigZombie::SPEED_MODIFIER_ATTACKING = (new AttributeModifier(eModifierId_MOB_PIG_ATTACKSPEED, 0.45, AttributeModifier::OPERATION_ADDITION))->setSerialize(false);
diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp
index 6443353bc..c71bbf95d 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 6c6408980..700935f6e 100644
--- a/Minecraft.World/Player.cpp
+++ b/Minecraft.World/Player.cpp
@@ -37,10 +37,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/PlayerInfoPacket.cpp b/Minecraft.World/PlayerInfoPacket.cpp
index 2cf020697..9cbe5f7cc 100644
--- a/Minecraft.World/PlayerInfoPacket.cpp
+++ b/Minecraft.World/PlayerInfoPacket.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "net.minecraft.world.entity.player.h"
-#include <Minecraft.Client/ServerPlayer.h>
-#include <Minecraft.Client/PlayerConnection.h>
+#include "..\Minecraft.Client\ServerPlayer.h"
+#include "..\Minecraft.Client\PlayerConnection.h"
 #include <qnet.h>
 #include "PacketListener.h"
 #include "InputOutputStream.h"
diff --git a/Minecraft.World/PortalForcer.cpp b/Minecraft.World/PortalForcer.cpp
index f8196e74a..8880399ef 100644
--- a/Minecraft.World/PortalForcer.cpp
+++ b/Minecraft.World/PortalForcer.cpp
@@ -3,7 +3,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
 #include "net.minecraft.world.level.dimension.h"
-#include <Minecraft.Client/ServerLevel.h>
+#include "..\Minecraft.Client\ServerLevel.h"
 #include "PortalForcer.h"
 
 PortalForcer::PortalPosition::PortalPosition(int x, int y, int z, __int64 time) : Pos(x, y, z)
diff --git a/Minecraft.World/PotionBrewing.cpp b/Minecraft.World/PotionBrewing.cpp
index 4849af6ff..5c454fd42 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 95e15a3ac..2b93578a6 100644
--- a/Minecraft.World/RandomLevelSource.cpp
+++ b/Minecraft.World/RandomLevelSource.cpp
@@ -11,7 +11,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 867bfe360..0107b6679 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"
@@ -12,7 +12,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"_cross";
 const wstring RedStoneDustTile::TEXTURE_LINE = L"_line";
diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp
index 367dc14f2..32379c2a1 100644
--- a/Minecraft.World/Sheep.cpp
+++ b/Minecraft.World/Sheep.cpp
@@ -16,7 +16,7 @@
 #include "net.minecraft.world.entity.player.h"
 #include "net.minecraft.world.entity.monster.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 fe21ad1dc..74adc8ccc 100644
--- a/Minecraft.World/SignTileEntity.cpp
+++ b/Minecraft.World/SignTileEntity.cpp
@@ -9,10 +9,10 @@
 #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.World/Level.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 9beb83c04..5cd4c77ee 100644
--- a/Minecraft.World/Silverfish.cpp
+++ b/Minecraft.World/Silverfish.cpp
@@ -6,7 +6,7 @@
 #include "net.minecraft.world.entity.ai.attributes.h"
 #include "net.minecraft.world.entity.monster.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 43ef09747..9afb95c6b 100644
--- a/Minecraft.World/Skeleton.cpp
+++ b/Minecraft.World/Skeleton.cpp
@@ -19,7 +19,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"
 
 Skeleton::Skeleton(Level *level) : Monster( level )
diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp
index 838189265..eb80d09c8 100644
--- a/Minecraft.World/Slime.cpp
+++ b/Minecraft.World/Slime.cpp
@@ -13,7 +13,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 930ec0751..6c78b56f8 100644
--- a/Minecraft.World/SnowMan.cpp
+++ b/Minecraft.World/SnowMan.cpp
@@ -12,7 +12,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/Socket.cpp b/Minecraft.World/Socket.cpp
index 0aad95d64..bd0c2032f 100644
--- a/Minecraft.World/Socket.cpp
+++ b/Minecraft.World/Socket.cpp
@@ -3,9 +3,9 @@
 #include "SocketAddress.h"
 #include "Socket.h"
 #include "ThreadName.h"
-#include <Minecraft.Client/ServerConnection.h>
+#include "..\Minecraft.Client\ServerConnection.h"
 #include <algorithm>
-#include <Minecraft.Client/PS3/PS3Extras/ShutdownManager.h>
+#include "..\Minecraft.Client\PS3\PS3Extras\ShutdownManager.h"
 
 // This current socket implementation is for the creation of a single local link. 2 sockets can be created, one for either end of this local
 // link, the end (0 or 1) is passed as a parameter to the ctor.
diff --git a/Minecraft.World/SpawnEggItem.cpp b/Minecraft.World/SpawnEggItem.cpp
index 3348a6f75..ab082bfb9 100644
--- a/Minecraft.World/SpawnEggItem.cpp
+++ b/Minecraft.World/SpawnEggItem.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/Spider.cpp b/Minecraft.World/Spider.cpp
index 47ba73485..49997db39 100644
--- a/Minecraft.World/Spider.cpp
+++ b/Minecraft.World/Spider.cpp
@@ -11,7 +11,7 @@
 #include "com.mojang.nbt.h"
 #include "BasicTypeContainers.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 656cb3231..7aae36154 100644
--- a/Minecraft.World/Squid.cpp
+++ b/Minecraft.World/Squid.cpp
@@ -9,7 +9,7 @@
 #include "net.minecraft.world.entity.monster.h"
 #include "SharedConstants.h"
 #include "Squid.h"
-#include <Minecraft.Client/Textures.h>
+#include "..\Minecraft.Client\Textures.h"
 
 void Squid::_init()
 {
diff --git a/Minecraft.World/Stats.cpp b/Minecraft.World/Stats.cpp
index e466a1204..89da587b7 100644
--- a/Minecraft.World/Stats.cpp
+++ b/Minecraft.World/Stats.cpp
@@ -8,7 +8,7 @@
 #include "ItemStat.h"
 #include "GeneralStat.h"
 #include "Stats.h"
-#include <Minecraft.Client/StatsCounter.h>
+#include "..\Minecraft.Client\StatsCounter.h"
 
 const int Stats::BLOCKS_MINED_OFFSET = 0x1000000;
 const int Stats::ITEMS_COLLECTED_OFFSET = 0x1010000;
diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp
index 2845897dc..bf9b058d1 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 1150807b5..1a89d3edf 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/TextureAndGeometryPacket.h b/Minecraft.World/TextureAndGeometryPacket.h
index ce12f23b0..8577f03df 100644
--- a/Minecraft.World/TextureAndGeometryPacket.h
+++ b/Minecraft.World/TextureAndGeometryPacket.h
@@ -2,8 +2,8 @@
 using namespace std;
 
 #include "Packet.h"
-#include <Minecraft.Client/Model.h>
-#include <Minecraft.Client/SkinBox.h>
+#include "..\Minecraft.Client\Model.h"
+#include "..\Minecraft.Client\SkinBox.h"
 
 class DLCSkinFile;
 
diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp
index 283dfae84..ccc8641b4 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 7a9efb2b0..1035bffdc 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/TileEntity.h b/Minecraft.World/TileEntity.h
index 665a7e930..8addb3ed0 100644
--- a/Minecraft.World/TileEntity.h
+++ b/Minecraft.World/TileEntity.h
@@ -2,7 +2,7 @@
 using namespace std;
 
 #include "HashExtension.h"
-#include <Minecraft.World/JavaIntHash.h>
+#include "..\Minecraft.World\JavaIntHash.h"
 
 class Level;
 class Packet;
diff --git a/Minecraft.World/TimeCommand.cpp b/Minecraft.World/TimeCommand.cpp
index a01c07b0b..4ac23c947 100644
--- a/Minecraft.World/TimeCommand.cpp
+++ b/Minecraft.World/TimeCommand.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "net.minecraft.commands.h"
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/ServerLevel.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
+#include "..\Minecraft.Client\ServerLevel.h"
 #include "net.minecraft.network.packet.h"
 #include "TimeCommand.h"
 
diff --git a/Minecraft.World/ToggleDownfallCommand.cpp b/Minecraft.World/ToggleDownfallCommand.cpp
index 924fb4ebf..1d0a4d9eb 100644
--- a/Minecraft.World/ToggleDownfallCommand.cpp
+++ b/Minecraft.World/ToggleDownfallCommand.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include <Minecraft.Client/MinecraftServer.h>
-#include <Minecraft.Client/ServerLevel.h>
+#include "..\Minecraft.Client\MinecraftServer.h"
+#include "..\Minecraft.Client\ServerLevel.h"
 #include "net.minecraft.commands.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.storage.h"
diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp
index 77a35405a..1fe32a12c 100644
--- a/Minecraft.World/Villager.cpp
+++ b/Minecraft.World/Villager.cpp
@@ -14,7 +14,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 4e698dd48..dba80ffa7 100644
--- a/Minecraft.World/VillagerGolem.cpp
+++ b/Minecraft.World/VillagerGolem.cpp
@@ -14,7 +14,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 d1ec3d967..15e43b9db 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 1223e7822..1988382e1 100644
--- a/Minecraft.World/Wolf.cpp
+++ b/Minecraft.World/Wolf.cpp
@@ -18,7 +18,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 82385d91d..df9d5c6b7 100644
--- a/Minecraft.World/Zombie.cpp
+++ b/Minecraft.World/Zombie.cpp
@@ -14,7 +14,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 "JavaMath.h"
 #include "SoundTypes.h"
diff --git a/Minecraft.World/compression.cpp b/Minecraft.World/compression.cpp
index eaf89776f..99c5228ab 100644
--- a/Minecraft.World/compression.cpp
+++ b/Minecraft.World/compression.cpp
@@ -1,13 +1,13 @@
 #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 __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__
 
 
diff --git a/Minecraft.World/compression.h b/Minecraft.World/compression.h
index 9cc3352bb..bceac78c6 100644
--- a/Minecraft.World/compression.h
+++ b/Minecraft.World/compression.h
@@ -2,7 +2,7 @@
 #include "FileHeader.h"
 
 #ifdef _XBOX_ONE
-#include <Minecraft.Client/Durango/DurangoExtras/xcompress.h>
+#include "..\Minecraft.Client\Durango\DurangoExtras\xcompress.h"
 #endif
 
 class Compression
diff --git a/Minecraft.World/net.minecraft.world.entity.projectile.h b/Minecraft.World/net.minecraft.world.entity.projectile.h
index 4211e1199..f871230ac 100644
--- a/Minecraft.World/net.minecraft.world.entity.projectile.h
+++ b/Minecraft.World/net.minecraft.world.entity.projectile.h
@@ -12,7 +12,7 @@
 #include "Throwable.h"
 #include "ThrownEnderpearl.h"
 #include "ThrownPotion.h"
-#include <ThrownExpBottle.h> // Brought forward from 1.2
+#include "ThrownExpBottle.h" // Brought forward from 1.2
 
 // Added TU 9
 #include "DragonFireball.h"
diff --git a/Minecraft.World/net.minecraft.world.item.h b/Minecraft.World/net.minecraft.world.item.h
index 71844b815..10ff76f5f 100644
--- a/Minecraft.World/net.minecraft.world.item.h
+++ b/Minecraft.World/net.minecraft.world.item.h
@@ -23,7 +23,7 @@
 #include "LeafTileItem.h"
 #include "MapItem.h"
 #include "MinecartItem.h"
-//#include <PaintingItem.h>
+//#include "PaintingItem.h"
 #include "PickaxeItem.h"
 #include "PistonTileItem.h"
 #include "RecordingItem.h"
@@ -54,7 +54,7 @@
 #include "PotionItem.h"
 #include "Rarity.h"
 #include "WaterLilyTileItem.h"
-#include <ExperienceItem.h> // 4J Stu brought forward
+#include "ExperienceItem.h" // 4J Stu brought forward
 
 // TU9
 #include "FireChargeItem.h"
diff --git a/Minecraft.World/net.minecraft.world.level.newbiome.layer.h b/Minecraft.World/net.minecraft.world.level.newbiome.layer.h
index 80d73d358..c45659d4f 100644
--- a/Minecraft.World/net.minecraft.world.level.newbiome.layer.h
+++ b/Minecraft.World/net.minecraft.world.level.newbiome.layer.h
@@ -21,7 +21,7 @@
 #include "TemperatureMixerLayer.h"
 #include "VoronoiZoom.h"
 #include "ZoomLayer.h"
-#include <GrowMushroomIslandLayer.h> // 4J added
+#include "GrowMushroomIslandLayer.h" // 4J added
 
 // 1.1.
 #include "RegionHillsLayer.h"
diff --git a/Minecraft.World/net.minecraft.world.level.storage.h b/Minecraft.World/net.minecraft.world.level.storage.h
index ff9f6e60d..262e1005e 100644
--- a/Minecraft.World/net.minecraft.world.level.storage.h
+++ b/Minecraft.World/net.minecraft.world.level.storage.h
@@ -9,8 +9,8 @@
 #include "LevelSummary.h"
 #include "McRegionLevelStorage.h"
 #include "McRegionLevelStorageSource.h"
-//#include <MemoryLevelStorage.h> // 4J removed as unused
-//#include <MemoryLevelStorageSource.h> // 4J removed as unused
+//#include "MemoryLevelStorage.h" // 4J removed as unused
+//#include "MemoryLevelStorageSource.h" // 4J removed as unused
 #include "MockedLevelStorage.h"
 #include "PlayerIO.h"
 #include "SavedDataStorage.h"
diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h
index 009ae9a73..beb3fa7bf 100644
--- a/Minecraft.World/stdafx.h
+++ b/Minecraft.World/stdafx.h
@@ -30,7 +30,7 @@ typedef unsigned __int64 __uint64;
 #include <DirectXMath.h>
 using namespace DirectX;
 #include <pix.h>
-#include <Minecraft.Client/Durango/DurangoExtras/DurangoStubs.h>
+#include "..\Minecraft.Client\Durango\DurangoExtras\DurangoStubs.h"
 #endif
 
 #if (defined __PS3__ || defined _XBOX )
@@ -125,7 +125,7 @@ typedef XUID GameSessionUID;
 #ifndef _XBOX
 #include "extraX64.h"
 #else
-#include <Minecraft.Client/xbox/network/extra.h>
+#include "..\Minecraft.Client\xbox\network\extra.h"
 #endif
 
 #include "Definitions.h"
@@ -154,27 +154,36 @@ typedef XUID GameSessionUID;
 void MemSect(int sect);
 
 #ifdef _XBOX
+<<<<<<< HEAD
 #include <Minecraft.Client/xbox/4JLibs/inc/4J_Profile.h>
 #include <Minecraft.Client/xbox/4JLibs/inc/4J_Render.h>
 #include <Minecraft.Client/xbox/4JLibs/inc/4J_xtms.h>
 #include <Minecraft.Client/xbox/4JLibs/inc/4J_Storage.h>
 #include <Minecraft.Client/xbox/4JLibs/inc/4J_Input.h>
+=======
+#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_XTMS.h"
+#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Input.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #elif defined (__PS3__)
-#include <Minecraft.Client/PS3/4JLibs/inc/4J_Profile.h>
-#include <Minecraft.Client/PS3/4JLibs/inc/4J_Render.h>
-#include <Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h>
-#include <Minecraft.Client/PS3/4JLibs/inc/4J_Input.h>
+#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Input.h"
 #elif defined _DURANGO
-#include <Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h>
-#include <Minecraft.Client/Durango/4JLibs/inc/4J_Render.h>
-#include <Minecraft.Client/Durango/4JLibs/inc/4J_Storage.h>
-#include <Minecraft.Client/Durango/4JLibs/inc/4J_Input.h>
+#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Input.h"
 #elif defined _WINDOWS64
-#include <Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h>
-#include <Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h>
-#include <Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h>
-#include <Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h>
+#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Input.h"
 #elif defined __PSVITA__
+<<<<<<< HEAD
 #include <Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h>
 #include <Minecraft.Client/PSVita/4JLibs/inc/4J_Render.h>
 #include <Minecraft.Client/PSVita/4JLibs/inc/4J_Storage.h>
@@ -184,70 +193,89 @@ void MemSect(int sect);
 #include <Minecraft.Client/Orbis/4JLibs/inc/4J_Render.h>
 #include <Minecraft.Client/Orbis/4JLibs/inc/4J_Storage.h>
 #include <Minecraft.Client/Orbis/4JLibs/inc/4J_Input.h>
+=======
+#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Input.h"
+#else
+#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Profile.h"
+#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Render.h"
+#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Storage.h"
+#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Input.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #endif
 
-#include <Minecraft.Client/Common/Network/GameNetworkManager.h>
+#include "..\Minecraft.Client\Common\Network\GameNetworkManager.h"
 
 // #ifdef _XBOX
+<<<<<<< HEAD
 #include <Minecraft.Client/Common/App_Defines.h>
 #include <Minecraft.Client/Common/UI/UIEnums.h>
 #include <Minecraft.Client/Common/App_enums.h>
 #include <Minecraft.Client/Common/Tutorial/TutorialEnum.h>
 #include <Minecraft.Client/Common/App_structs.h>
+=======
+#include "..\Minecraft.Client\Common\App_defines.h"
+#include "..\Minecraft.Client\Common\UI\UIEnums.h"
+#include "..\Minecraft.Client\Common\App_enums.h"
+#include "..\Minecraft.Client\Common\Tutorial\TutorialEnum.h"
+#include "..\Minecraft.Client\Common\App_structs.h"
+>>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 //#endif
 
 #ifdef _XBOX
-#include <Minecraft.Client/Common/XUI/XUI_Helper.h>
-#include <Minecraft.Client/Common/XUI/XUI_Scene_Base.h>
+#include "..\Minecraft.Client\Common\XUI\XUI_Helper.h"
+#include "..\Minecraft.Client\Common\XUI\XUI_Scene_Base.h"
 #endif
-#include <Minecraft.Client/Common/Consoles_App.h>
-#include <Minecraft.Client/Common/Minecraft_Macros.h>
-#include <Minecraft.Client/Common/Colours/ColourTable.h>
+#include "..\Minecraft.Client\Common\Consoles_App.h"
+#include "..\Minecraft.Client\Common\Minecraft_Macros.h"
+#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
 
-#include <Minecraft.Client/Common/BuildVer.h>
+#include "..\Minecraft.Client\Common\BuildVer.h"
 
 #ifdef _XBOX
-#include <Minecraft.Client/Xbox/Xbox_App.h>
-#include <Minecraft.Client/XboxMedia/strings.h>
-#include <Minecraft.Client/Xbox/Sentient/SentientTelemetryCommon.h>
-#include <Minecraft.Client/Xbox/Sentient/MinecraftTelemetry.h>
+#include "..\Minecraft.Client\Xbox\Xbox_App.h"
+#include "..\Minecraft.Client\XboxMedia\strings.h"
+#include "..\Minecraft.Client\Xbox\Sentient\SentientTelemetryCommon.h"
+#include "..\Minecraft.Client\Xbox\Sentient\MinecraftTelemetry.h"
 
 #elif defined (__PS3__)
-#include <Minecraft.Client/PS3/PS3_App.h>
-#include <Minecraft.Client/PS3Media/strings.h>
-#include <Minecraft.Client/PS3/Sentient/SentientTelemetryCommon.h>
-#include <Minecraft.Client/PS3/Sentient/MinecraftTelemetry.h>
+#include "..\Minecraft.Client\PS3\PS3_App.h"
+#include "..\Minecraft.Client\PS3Media\strings.h"
+#include "..\Minecraft.Client\PS3\Sentient\SentientTelemetryCommon.h"
+#include "..\Minecraft.Client\PS3\Sentient\MinecraftTelemetry.h"
 
 #elif defined _DURANGO
-#include <Minecraft.Client/Durango/Durango_App.h>
-#include <Minecraft.Client/DurangoMedia/strings.h>
-//#include <Minecraft.Client/Durango/Sentient/SentientManager.h>
-#include <Minecraft.Client/Durango/Sentient/SentientTelemetryCommon.h>
-#include <Minecraft.Client/Durango/Sentient/MinecraftTelemetry.h>
-#include <Minecraft.Client/Durango/Sentient/TelemetryEnum.h>
+#include "..\Minecraft.Client\Durango\Durango_App.h"
+#include "..\Minecraft.Client\DurangoMedia\strings.h"
+//#include "..\Minecraft.Client\Durango\Sentient\SentientManager.h"
+#include "..\Minecraft.Client\Durango\Sentient\SentientTelemetryCommon.h"
+#include "..\Minecraft.Client\Durango\Sentient\MinecraftTelemetry.h"
+#include "..\Minecraft.Client\Durango\Sentient\TelemetryEnum.h"
 
 #elif defined _WINDOWS64
-#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>
+#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"
 
 #elif defined __PSVITA__
-#include <Minecraft.Client/PSVita/PSVita_App.h>
-#include <Minecraft.Client/PSVitaMedia/strings.h>		// TODO - create PSVita-specific version of this
-#include <Minecraft.Client/PSVita/Sentient/SentientManager.h>
-#include <Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h>
+#include "..\Minecraft.Client\PSVita\PSVita_App.h"
+#include "..\Minecraft.Client\PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
+#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h"
+#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h"
 #else
-#include <Minecraft.Client/Orbis/Orbis_App.h>
-#include <Minecraft.Client/OrbisMedia/strings.h>
-#include <Minecraft.Client/Orbis/Sentient/SentientTelemetryCommon.h>
-#include <Minecraft.Client/Orbis/Sentient/MinecraftTelemetry.h>
+#include "..\Minecraft.Client\Orbis\Orbis_App.h"
+#include "..\Minecraft.Client\OrbisMedia\strings.h"
+#include "..\Minecraft.Client\Orbis\Sentient\SentientTelemetryCommon.h"
+#include "..\Minecraft.Client\Orbis\Sentient\MinecraftTelemetry.h"
 #endif
 
-#include <Minecraft.Client/Common/DLC/DLCSkinFile.h>
-#include <Minecraft.Client/Common/Console_Awards_enum.h>
-#include <Minecraft.Client/Common/Potion_Macros.h>
-#include <Minecraft.Client/Common/Console_Debug_enum.h>
-#include <Minecraft.Client/Common/GameRules/ConsoleGameRulesConstants.h>
-#include <Minecraft.Client/Common/GameRules/ConsoleGameRules.h>
-#include <Minecraft.Client/Common/Telemetry/TelemetryManager.h>
+#include "..\Minecraft.Client\Common\DLC\DLCSkinFile.h"
+#include "..\Minecraft.Client\Common\Console_Awards_enum.h"
+#include "..\Minecraft.Client\Common\Potion_Macros.h"
+#include "..\Minecraft.Client\Common\Console_Debug_enum.h"
+#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRulesConstants.h"
+#include "..\Minecraft.Client\Common\GameRules\ConsoleGameRules.h"
+#include "..\Minecraft.Client\Common\Telemetry\TelemetryManager.h"
diff --git a/Minecraft.World/x64headers/extraX64.h b/Minecraft.World/x64headers/extraX64.h
index cf1baf335..0ea70a01b 100644
--- a/Minecraft.World/x64headers/extraX64.h
+++ b/Minecraft.World/x64headers/extraX64.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <functional>
 
-#include <Minecraft.Client/SkinBox.h>
+#include "../../Minecraft.Client/SkinBox.h"
 
 
 #include <vector>
@@ -27,8 +27,8 @@ const int MINECRAFT_NET_MAX_PLAYERS = 8;
 #include <net.h>
 #include <np/np_npid.h>
 #include <user_service.h>
-#include <Minecraft.Client/Orbis/Orbis_PlayerUID.h>
-#include <Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h>
+#include "..\..\Minecraft.Client\Orbis\Orbis_PlayerUID.h"
+#include "..\..\Minecraft.Client\Orbis\Network\SQRNetworkManager_Orbis.h"
 typedef SQRNetworkManager_Orbis::SessionID SessionID;
 typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO;
 
@@ -38,8 +38,8 @@ typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO;
 #include <netex/libnetctl.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <Minecraft.Client/PS3/PS3_PlayerUID.h>
-#include <Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h>
+#include "..\..\Minecraft.Client\PS3\PS3_PlayerUID.h"
+#include "..\..\Minecraft.Client\PS3\Network\SQRNetworkManager_PS3.h"
 typedef SQRNetworkManager::SessionID SessionID;
 typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO;
 
@@ -47,15 +47,15 @@ typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO;
 #include <np.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h>
-#include <Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h>
-#include <Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h>
+#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h"
+#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h"
+#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
 typedef SQRNetworkManager_Vita::SessionID SessionID;
 typedef SQRNetworkManager_Vita::PresenceSyncInfo INVITE_INFO;
 
 #elif defined _DURANGO
-#include <Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h>
-#include <Minecraft.Client/Durango/Network/DQRNetworkManager.h>
+#include "..\..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h"
+#include "..\..\Minecraft.Client\Durango\Network\DQRNetworkManager.h"
 typedef ULONGLONG SessionID;
 typedef ULONGLONG GameSessionUID;
 typedef DQRNetworkManager::SessionInfo INVITE_INFO;