From 4516cf2e300b112dbdc677e7e20a4e17ace5d72d Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Fri, 6 Mar 2026 12:04:16 -0600
Subject: [PATCH] refactor: unglob `std::enable_shared_from_this`

---
 Minecraft.World/Blocks/TileEntities/TileEntity.h                | 2 +-
 Minecraft.World/Containers/ClientSideMerchant.h                 | 2 +-
 Minecraft.World/Containers/RepairContainer.h                    | 2 +-
 Minecraft.World/Entities/Entity.h                               | 2 +-
 Minecraft.World/Items/Item.h                                    | 2 +-
 Minecraft.World/Items/ItemInstance.h                            | 2 +-
 Minecraft.World/Level/Storage/SavedData.h                       | 2 +-
 Minecraft.World/Network/Packets/AddEntityPacket.h               | 2 +-
 Minecraft.World/Network/Packets/AddExperienceOrbPacket.h        | 2 +-
 Minecraft.World/Network/Packets/AddGlobalEntityPacket.h         | 2 +-
 Minecraft.World/Network/Packets/AddMobPacket.h                  | 2 +-
 Minecraft.World/Network/Packets/AddPaintingPacket.h             | 2 +-
 Minecraft.World/Network/Packets/AddPlayerPacket.h               | 2 +-
 Minecraft.World/Network/Packets/AnimatePacket.h                 | 2 +-
 Minecraft.World/Network/Packets/AwardStatPacket.h               | 2 +-
 Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h       | 2 +-
 Minecraft.World/Network/Packets/ChatPacket.h                    | 2 +-
 Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h        | 2 +-
 Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h     | 2 +-
 Minecraft.World/Network/Packets/ChunkVisibilityPacket.h         | 2 +-
 Minecraft.World/Network/Packets/ClientCommandPacket.h           | 2 +-
 Minecraft.World/Network/Packets/ComplexItemDataPacket.h         | 2 +-
 Minecraft.World/Network/Packets/ContainerAckPacket.h            | 2 +-
 Minecraft.World/Network/Packets/ContainerButtonClickPacket.h    | 2 +-
 Minecraft.World/Network/Packets/ContainerClickPacket.h          | 2 +-
 Minecraft.World/Network/Packets/ContainerClosePacket.h          | 2 +-
 Minecraft.World/Network/Packets/ContainerOpenPacket.h           | 2 +-
 Minecraft.World/Network/Packets/ContainerSetContentPacket.h     | 2 +-
 Minecraft.World/Network/Packets/ContainerSetDataPacket.h        | 2 +-
 Minecraft.World/Network/Packets/ContainerSetSlotPacket.h        | 2 +-
 Minecraft.World/Network/Packets/CraftItemPacket.h               | 2 +-
 Minecraft.World/Network/Packets/CustomPayloadPacket.h           | 2 +-
 Minecraft.World/Network/Packets/DebugOptionsPacket.h            | 2 +-
 Minecraft.World/Network/Packets/DisconnectPacket.h              | 2 +-
 Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h  | 2 +-
 Minecraft.World/Network/Packets/EntityEventPacket.h             | 2 +-
 Minecraft.World/Network/Packets/ExplodePacket.h                 | 2 +-
 Minecraft.World/Network/Packets/GameCommandPacket.h             | 2 +-
 Minecraft.World/Network/Packets/GameEventPacket.h               | 2 +-
 Minecraft.World/Network/Packets/GetInfoPacket.h                 | 2 +-
 Minecraft.World/Network/Packets/InteractPacket.h                | 2 +-
 Minecraft.World/Network/Packets/KeepAlivePacket.h               | 2 +-
 Minecraft.World/Network/Packets/KickPlayerPacket.h              | 2 +-
 Minecraft.World/Network/Packets/LevelEventPacket.h              | 2 +-
 Minecraft.World/Network/Packets/LevelSoundPacket.h              | 2 +-
 Minecraft.World/Network/Packets/LoginPacket.h                   | 2 +-
 Minecraft.World/Network/Packets/MoveEntityPacket.h              | 2 +-
 Minecraft.World/Network/Packets/MoveEntityPacketSmall.h         | 2 +-
 Minecraft.World/Network/Packets/MovePlayerPacket.h              | 2 +-
 Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h         | 2 +-
 Minecraft.World/Network/Packets/PlayerActionPacket.h            | 2 +-
 Minecraft.World/Network/Packets/PlayerCommandPacket.h           | 2 +-
 Minecraft.World/Network/Packets/PlayerInfoPacket.h              | 2 +-
 Minecraft.World/Network/Packets/PlayerInputPacket.h             | 2 +-
 Minecraft.World/Network/Packets/PreLoginPacket.h                | 2 +-
 Minecraft.World/Network/Packets/RemoveEntitiesPacket.h          | 2 +-
 Minecraft.World/Network/Packets/RemoveMobEffectPacket.h         | 2 +-
 Minecraft.World/Network/Packets/RespawnPacket.h                 | 2 +-
 Minecraft.World/Network/Packets/RotateHeadPacket.h              | 2 +-
 Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h   | 2 +-
 Minecraft.World/Network/Packets/SetCarriedItemPacket.h          | 2 +-
 Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h     | 2 +-
 Minecraft.World/Network/Packets/SetEntityDataPacket.h           | 2 +-
 Minecraft.World/Network/Packets/SetEntityMotionPacket.h         | 2 +-
 Minecraft.World/Network/Packets/SetEquippedItemPacket.h         | 2 +-
 Minecraft.World/Network/Packets/SetExperiencePacket.h           | 2 +-
 Minecraft.World/Network/Packets/SetHealthPacket.h               | 2 +-
 Minecraft.World/Network/Packets/SetRidingPacket.h               | 2 +-
 Minecraft.World/Network/Packets/SetSpawnPositionPacket.h        | 2 +-
 Minecraft.World/Network/Packets/SetTimePacket.h                 | 2 +-
 Minecraft.World/Network/Packets/SignUpdatePacket.h              | 2 +-
 Minecraft.World/Network/Packets/TakeItemEntityPacket.h          | 2 +-
 Minecraft.World/Network/Packets/TeleportEntityPacket.h          | 2 +-
 .../Network/Packets/TextureAndGeometryChangePacket.h            | 2 +-
 Minecraft.World/Network/Packets/TextureAndGeometryPacket.h      | 2 +-
 Minecraft.World/Network/Packets/TextureChangePacket.h           | 2 +-
 Minecraft.World/Network/Packets/TexturePacket.h                 | 2 +-
 Minecraft.World/Network/Packets/TileDestructionPacket.h         | 2 +-
 Minecraft.World/Network/Packets/TileEntityDataPacket.h          | 2 +-
 Minecraft.World/Network/Packets/TileEventPacket.h               | 2 +-
 Minecraft.World/Network/Packets/TileUpdatePacket.h              | 2 +-
 Minecraft.World/Network/Packets/TradeItemPacket.h               | 2 +-
 Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h  | 2 +-
 Minecraft.World/Network/Packets/UpdateMobEffectPacket.h         | 2 +-
 Minecraft.World/Network/Packets/UpdateProgressPacket.h          | 2 +-
 Minecraft.World/Network/Packets/UseItemPacket.h                 | 2 +-
 Minecraft.World/Network/Packets/XZPacket.h                      | 2 +-
 87 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/Minecraft.World/Blocks/TileEntities/TileEntity.h b/Minecraft.World/Blocks/TileEntities/TileEntity.h
index 65544407e..70cd8abd9 100644
--- a/Minecraft.World/Blocks/TileEntities/TileEntity.h
+++ b/Minecraft.World/Blocks/TileEntities/TileEntity.h
@@ -10,7 +10,7 @@ class CompoundTag;
 
 typedef TileEntity *(*tileEntityCreateFn)();
 
-class TileEntity : public enable_shared_from_this<TileEntity>
+class TileEntity : public std::enable_shared_from_this<TileEntity>
 {
 public:
 	static void staticCtor();
diff --git a/Minecraft.World/Containers/ClientSideMerchant.h b/Minecraft.World/Containers/ClientSideMerchant.h
index fa02c4867..d5e8861ff 100644
--- a/Minecraft.World/Containers/ClientSideMerchant.h
+++ b/Minecraft.World/Containers/ClientSideMerchant.h
@@ -6,7 +6,7 @@ class MerchantContainer;
 class MerchantRecipeList;
 class MerchantRecipe;
 
-class ClientSideMerchant : public Merchant, public enable_shared_from_this<ClientSideMerchant>
+class ClientSideMerchant : public Merchant, public std::enable_shared_from_this<ClientSideMerchant>
 {
 private:
 	MerchantContainer *container;
diff --git a/Minecraft.World/Containers/RepairContainer.h b/Minecraft.World/Containers/RepairContainer.h
index 758132c0f..c222f449f 100644
--- a/Minecraft.World/Containers/RepairContainer.h
+++ b/Minecraft.World/Containers/RepairContainer.h
@@ -4,7 +4,7 @@
 
 class RepairMenu;
 
-class RepairContainer : public SimpleContainer, public enable_shared_from_this<RepairContainer>
+class RepairContainer : public SimpleContainer, public std::enable_shared_from_this<RepairContainer>
 {
 private:
 	RepairMenu *m_menu;
diff --git a/Minecraft.World/Entities/Entity.h b/Minecraft.World/Entities/Entity.h
index 0a32448ee..69d669ae9 100644
--- a/Minecraft.World/Entities/Entity.h
+++ b/Minecraft.World/Entities/Entity.h
@@ -32,7 +32,7 @@ enum EEntityDamageType
 	eEntityDamageType_Cactus,
 };
 
-class Entity : public enable_shared_from_this<Entity>
+class Entity : public std::enable_shared_from_this<Entity>
 {
 friend class Gui; // 4J Stu - Added to be able to access the shared flag functions and constants, without making them publicly available to everything
 public:
diff --git a/Minecraft.World/Items/Item.h b/Minecraft.World/Items/Item.h
index c4496a211..e3d94b459 100644
--- a/Minecraft.World/Items/Item.h
+++ b/Minecraft.World/Items/Item.h
@@ -24,7 +24,7 @@ class EnchantedBookItem;
 #define ITEM_ICON_COLUMNS 16
 
 
-class Item : public enable_shared_from_this<Item>
+class Item : public std::enable_shared_from_this<Item>
 {
 public:
 	static const int ITEM_NUM_COUNT = 32000;
diff --git a/Minecraft.World/Items/ItemInstance.h b/Minecraft.World/Items/ItemInstance.h
index 8bda0f646..755dfc4c9 100644
--- a/Minecraft.World/Items/ItemInstance.h
+++ b/Minecraft.World/Items/ItemInstance.h
@@ -18,7 +18,7 @@ class Icon;
 
 // 4J Stu - While this is not really an abstract class, we don't want to make new instances of it,
 // mainly because there are too many ctors and that doesn't fit well into out macroisation setup
-class ItemInstance: public enable_shared_from_this<ItemInstance>
+class ItemInstance: public std::enable_shared_from_this<ItemInstance>
 {
 public:
 	static const wchar_t *TAG_ENCH_ID;
diff --git a/Minecraft.World/Level/Storage/SavedData.h b/Minecraft.World/Level/Storage/SavedData.h
index 6a57aec25..9c538fe68 100644
--- a/Minecraft.World/Level/Storage/SavedData.h
+++ b/Minecraft.World/Level/Storage/SavedData.h
@@ -5,7 +5,7 @@ using namespace std;
 
 class CompoundTag;
 
-class SavedData :  public enable_shared_from_this<SavedData>
+class SavedData :  public std::enable_shared_from_this<SavedData>
 {
 public:
 	const std::wstring id;
diff --git a/Minecraft.World/Network/Packets/AddEntityPacket.h b/Minecraft.World/Network/Packets/AddEntityPacket.h
index 82818b39e..f1753ae5a 100644
--- a/Minecraft.World/Network/Packets/AddEntityPacket.h
+++ b/Minecraft.World/Network/Packets/AddEntityPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AddEntityPacket : public Packet, public enable_shared_from_this<AddEntityPacket>
+class AddEntityPacket : public Packet, public std::enable_shared_from_this<AddEntityPacket>
 {
 public:
 	static const int BOAT = 1;
diff --git a/Minecraft.World/Network/Packets/AddExperienceOrbPacket.h b/Minecraft.World/Network/Packets/AddExperienceOrbPacket.h
index 33ae06429..5dad3ddb5 100644
--- a/Minecraft.World/Network/Packets/AddExperienceOrbPacket.h
+++ b/Minecraft.World/Network/Packets/AddExperienceOrbPacket.h
@@ -4,7 +4,7 @@
 
 class ExperienceOrb;
 
-class AddExperienceOrbPacket : public Packet, public enable_shared_from_this<AddExperienceOrbPacket>
+class AddExperienceOrbPacket : public Packet, public std::enable_shared_from_this<AddExperienceOrbPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/AddGlobalEntityPacket.h b/Minecraft.World/Network/Packets/AddGlobalEntityPacket.h
index 9f0f518c0..a457f7748 100644
--- a/Minecraft.World/Network/Packets/AddGlobalEntityPacket.h
+++ b/Minecraft.World/Network/Packets/AddGlobalEntityPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class AddGlobalEntityPacket : public Packet, public enable_shared_from_this<AddGlobalEntityPacket>
+class AddGlobalEntityPacket : public Packet, public std::enable_shared_from_this<AddGlobalEntityPacket>
 {
 public:
 	static const int LIGHTNING;
diff --git a/Minecraft.World/Network/Packets/AddMobPacket.h b/Minecraft.World/Network/Packets/AddMobPacket.h
index 9ee5313e7..5a3db58d2 100644
--- a/Minecraft.World/Network/Packets/AddMobPacket.h
+++ b/Minecraft.World/Network/Packets/AddMobPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 class Mob;
 
-class AddMobPacket : public Packet, public enable_shared_from_this<AddMobPacket>
+class AddMobPacket : public Packet, public std::enable_shared_from_this<AddMobPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/AddPaintingPacket.h b/Minecraft.World/Network/Packets/AddPaintingPacket.h
index 0ec0c73f9..ddde8ed6c 100644
--- a/Minecraft.World/Network/Packets/AddPaintingPacket.h
+++ b/Minecraft.World/Network/Packets/AddPaintingPacket.h
@@ -5,7 +5,7 @@ using namespace std;
 
 class Painting;
 
-class AddPaintingPacket : public Packet, public enable_shared_from_this<AddPaintingPacket>
+class AddPaintingPacket : public Packet, public std::enable_shared_from_this<AddPaintingPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/AddPlayerPacket.h b/Minecraft.World/Network/Packets/AddPlayerPacket.h
index 84537d202..161a67f75 100644
--- a/Minecraft.World/Network/Packets/AddPlayerPacket.h
+++ b/Minecraft.World/Network/Packets/AddPlayerPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 class Player;
 
-class AddPlayerPacket : public Packet, public enable_shared_from_this<AddPlayerPacket>
+class AddPlayerPacket : public Packet, public std::enable_shared_from_this<AddPlayerPacket>
 {
 
 private:
diff --git a/Minecraft.World/Network/Packets/AnimatePacket.h b/Minecraft.World/Network/Packets/AnimatePacket.h
index 201d36128..8c5c39961 100644
--- a/Minecraft.World/Network/Packets/AnimatePacket.h
+++ b/Minecraft.World/Network/Packets/AnimatePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AnimatePacket : public Packet, public enable_shared_from_this<AnimatePacket>
+class AnimatePacket : public Packet, public std::enable_shared_from_this<AnimatePacket>
 {
 public:
 	static const int SWING = 1;
diff --git a/Minecraft.World/Network/Packets/AwardStatPacket.h b/Minecraft.World/Network/Packets/AwardStatPacket.h
index aad8511dc..d15c5a468 100644
--- a/Minecraft.World/Network/Packets/AwardStatPacket.h
+++ b/Minecraft.World/Network/Packets/AwardStatPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AwardStatPacket : public Packet, public enable_shared_from_this<AwardStatPacket>
+class AwardStatPacket : public Packet, public std::enable_shared_from_this<AwardStatPacket>
 {
 public:
 	int statId;
diff --git a/Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h b/Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h
index ac38a3814..868298b4b 100644
--- a/Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h
+++ b/Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h
@@ -5,7 +5,7 @@ using namespace std;
 
 class Level;
 
-class BlockRegionUpdatePacket : public Packet, public enable_shared_from_this<BlockRegionUpdatePacket>
+class BlockRegionUpdatePacket : public Packet, public std::enable_shared_from_this<BlockRegionUpdatePacket>
 {
 public:
     int x, y, z;
diff --git a/Minecraft.World/Network/Packets/ChatPacket.h b/Minecraft.World/Network/Packets/ChatPacket.h
index ac702a4ab..1cdb3340d 100644
--- a/Minecraft.World/Network/Packets/ChatPacket.h
+++ b/Minecraft.World/Network/Packets/ChatPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ChatPacket : public Packet, public enable_shared_from_this<ChatPacket>
+class ChatPacket : public Packet, public std::enable_shared_from_this<ChatPacket>
 {
     // longest allowed string is "<" + name + "> " + message
 private:
diff --git a/Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h b/Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h
index 11365b165..ae9275ce3 100644
--- a/Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h
+++ b/Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h
@@ -5,7 +5,7 @@ using namespace std;
 
 class Level;
 
-class ChunkTilesUpdatePacket : public Packet, public enable_shared_from_this<ChunkTilesUpdatePacket>
+class ChunkTilesUpdatePacket : public Packet, public std::enable_shared_from_this<ChunkTilesUpdatePacket>
 {
 public:
 	int xc, zc;
diff --git a/Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h b/Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h
index cc7f337d2..c72e62818 100644
--- a/Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h
+++ b/Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h
@@ -7,7 +7,7 @@ class Level;
 
 // 4J Added this packet so that when a player initially joins the game we just need to send them the area of chunks
 // around them rather than one packet for each chunk
-class ChunkVisibilityAreaPacket : public Packet, public enable_shared_from_this<ChunkVisibilityAreaPacket>
+class ChunkVisibilityAreaPacket : public Packet, public std::enable_shared_from_this<ChunkVisibilityAreaPacket>
 {
 public:
     int m_minX, m_maxX, m_minZ, m_maxZ;
diff --git a/Minecraft.World/Network/Packets/ChunkVisibilityPacket.h b/Minecraft.World/Network/Packets/ChunkVisibilityPacket.h
index 8a509e6ac..a2a6ef01c 100644
--- a/Minecraft.World/Network/Packets/ChunkVisibilityPacket.h
+++ b/Minecraft.World/Network/Packets/ChunkVisibilityPacket.h
@@ -7,7 +7,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class ChunkVisibilityPacket : public Packet, public enable_shared_from_this<ChunkVisibilityPacket>
+class ChunkVisibilityPacket : public Packet, public std::enable_shared_from_this<ChunkVisibilityPacket>
 {
 public:
 	int x, z;
diff --git a/Minecraft.World/Network/Packets/ClientCommandPacket.h b/Minecraft.World/Network/Packets/ClientCommandPacket.h
index 1dea6b222..2a061ee8e 100644
--- a/Minecraft.World/Network/Packets/ClientCommandPacket.h
+++ b/Minecraft.World/Network/Packets/ClientCommandPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class ClientCommandPacket : public Packet, public enable_shared_from_this<ClientCommandPacket>
+class ClientCommandPacket : public Packet, public std::enable_shared_from_this<ClientCommandPacket>
 {
 public:
 	static const int LOGIN_COMPLETE = 0;
diff --git a/Minecraft.World/Network/Packets/ComplexItemDataPacket.h b/Minecraft.World/Network/Packets/ComplexItemDataPacket.h
index f299647d3..34d62da37 100644
--- a/Minecraft.World/Network/Packets/ComplexItemDataPacket.h
+++ b/Minecraft.World/Network/Packets/ComplexItemDataPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ComplexItemDataPacket : public Packet, public enable_shared_from_this<ComplexItemDataPacket>
+class ComplexItemDataPacket : public Packet, public std::enable_shared_from_this<ComplexItemDataPacket>
 {
 public:
 	short itemType;
diff --git a/Minecraft.World/Network/Packets/ContainerAckPacket.h b/Minecraft.World/Network/Packets/ContainerAckPacket.h
index 32ff3298d..635b194f2 100644
--- a/Minecraft.World/Network/Packets/ContainerAckPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerAckPacket.h
@@ -7,7 +7,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class ContainerAckPacket : public Packet, public enable_shared_from_this<ContainerAckPacket>
+class ContainerAckPacket : public Packet, public std::enable_shared_from_this<ContainerAckPacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerButtonClickPacket.h b/Minecraft.World/Network/Packets/ContainerButtonClickPacket.h
index 64ee6cb56..88bde9abf 100644
--- a/Minecraft.World/Network/Packets/ContainerButtonClickPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerButtonClickPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class ContainerButtonClickPacket : public Packet, public enable_shared_from_this<ContainerButtonClickPacket>
+class ContainerButtonClickPacket : public Packet, public std::enable_shared_from_this<ContainerButtonClickPacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerClickPacket.h b/Minecraft.World/Network/Packets/ContainerClickPacket.h
index 47c7e4181..98f320fdb 100644
--- a/Minecraft.World/Network/Packets/ContainerClickPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerClickPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerClickPacket : public Packet, public enable_shared_from_this<ContainerClickPacket>
+class ContainerClickPacket : public Packet, public std::enable_shared_from_this<ContainerClickPacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerClosePacket.h b/Minecraft.World/Network/Packets/ContainerClosePacket.h
index 562646fa6..190926c36 100644
--- a/Minecraft.World/Network/Packets/ContainerClosePacket.h
+++ b/Minecraft.World/Network/Packets/ContainerClosePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerClosePacket : public Packet, public enable_shared_from_this<ContainerClosePacket>
+class ContainerClosePacket : public Packet, public std::enable_shared_from_this<ContainerClosePacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerOpenPacket.h b/Minecraft.World/Network/Packets/ContainerOpenPacket.h
index 3d351a936..169b7d7d5 100644
--- a/Minecraft.World/Network/Packets/ContainerOpenPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerOpenPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerOpenPacket : public Packet, public enable_shared_from_this<ContainerOpenPacket>
+class ContainerOpenPacket : public Packet, public std::enable_shared_from_this<ContainerOpenPacket>
 {
 public:
 	static const int CONTAINER = 0;
diff --git a/Minecraft.World/Network/Packets/ContainerSetContentPacket.h b/Minecraft.World/Network/Packets/ContainerSetContentPacket.h
index b89dab491..2b38d21f0 100644
--- a/Minecraft.World/Network/Packets/ContainerSetContentPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerSetContentPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetContentPacket : public Packet, public enable_shared_from_this<ContainerSetContentPacket>
+class ContainerSetContentPacket : public Packet, public std::enable_shared_from_this<ContainerSetContentPacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerSetDataPacket.h b/Minecraft.World/Network/Packets/ContainerSetDataPacket.h
index 6f694aeb5..64ee50f79 100644
--- a/Minecraft.World/Network/Packets/ContainerSetDataPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerSetDataPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetDataPacket : public Packet, public enable_shared_from_this<ContainerSetDataPacket>
+class ContainerSetDataPacket : public Packet, public std::enable_shared_from_this<ContainerSetDataPacket>
 {
 public:
 	int containerId;
diff --git a/Minecraft.World/Network/Packets/ContainerSetSlotPacket.h b/Minecraft.World/Network/Packets/ContainerSetSlotPacket.h
index f996fc89e..6b7958c78 100644
--- a/Minecraft.World/Network/Packets/ContainerSetSlotPacket.h
+++ b/Minecraft.World/Network/Packets/ContainerSetSlotPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetSlotPacket : public Packet, public enable_shared_from_this<ContainerSetSlotPacket>
+class ContainerSetSlotPacket : public Packet, public std::enable_shared_from_this<ContainerSetSlotPacket>
 {
 public:
 	static const int CONTAINER;
diff --git a/Minecraft.World/Network/Packets/CraftItemPacket.h b/Minecraft.World/Network/Packets/CraftItemPacket.h
index b08d609ea..c6618698c 100644
--- a/Minecraft.World/Network/Packets/CraftItemPacket.h
+++ b/Minecraft.World/Network/Packets/CraftItemPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class CraftItemPacket : public Packet, public enable_shared_from_this<CraftItemPacket>
+class CraftItemPacket : public Packet, public std::enable_shared_from_this<CraftItemPacket>
 {
 public:
 	int recipe;
diff --git a/Minecraft.World/Network/Packets/CustomPayloadPacket.h b/Minecraft.World/Network/Packets/CustomPayloadPacket.h
index 7c199ce27..09d6504d4 100644
--- a/Minecraft.World/Network/Packets/CustomPayloadPacket.h
+++ b/Minecraft.World/Network/Packets/CustomPayloadPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class CustomPayloadPacket : public Packet, public enable_shared_from_this<CustomPayloadPacket>
+class CustomPayloadPacket : public Packet, public std::enable_shared_from_this<CustomPayloadPacket>
 {
 public:
 
diff --git a/Minecraft.World/Network/Packets/DebugOptionsPacket.h b/Minecraft.World/Network/Packets/DebugOptionsPacket.h
index d731ebdd0..924027580 100644
--- a/Minecraft.World/Network/Packets/DebugOptionsPacket.h
+++ b/Minecraft.World/Network/Packets/DebugOptionsPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class DebugOptionsPacket : public Packet, public enable_shared_from_this<DebugOptionsPacket>
+class DebugOptionsPacket : public Packet, public std::enable_shared_from_this<DebugOptionsPacket>
 {
 public:
 	unsigned int m_uiVal;
diff --git a/Minecraft.World/Network/Packets/DisconnectPacket.h b/Minecraft.World/Network/Packets/DisconnectPacket.h
index e2815c2c0..4aa0b2964 100644
--- a/Minecraft.World/Network/Packets/DisconnectPacket.h
+++ b/Minecraft.World/Network/Packets/DisconnectPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class DisconnectPacket : public Packet, public enable_shared_from_this<DisconnectPacket>
+class DisconnectPacket : public Packet, public std::enable_shared_from_this<DisconnectPacket>
 {
 public:
 
diff --git a/Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h b/Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h
index 57a730d90..ce0a2fc16 100644
--- a/Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h
+++ b/Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class EntityActionAtPositionPacket : public Packet, public enable_shared_from_this<EntityActionAtPositionPacket>
+class EntityActionAtPositionPacket : public Packet, public std::enable_shared_from_this<EntityActionAtPositionPacket>
 {
 public:
 	static const int START_SLEEP;
diff --git a/Minecraft.World/Network/Packets/EntityEventPacket.h b/Minecraft.World/Network/Packets/EntityEventPacket.h
index 93c66359a..2b4ff842a 100644
--- a/Minecraft.World/Network/Packets/EntityEventPacket.h
+++ b/Minecraft.World/Network/Packets/EntityEventPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class EntityEventPacket : public Packet, public enable_shared_from_this<EntityEventPacket>
+class EntityEventPacket : public Packet, public std::enable_shared_from_this<EntityEventPacket>
 {
 public:
 	int entityId;
diff --git a/Minecraft.World/Network/Packets/ExplodePacket.h b/Minecraft.World/Network/Packets/ExplodePacket.h
index 4dc7425fd..8416e22a1 100644
--- a/Minecraft.World/Network/Packets/ExplodePacket.h
+++ b/Minecraft.World/Network/Packets/ExplodePacket.h
@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Level/TilePos.h"
 #include "Packet.h"
 
-class ExplodePacket : public Packet, public enable_shared_from_this<ExplodePacket>
+class ExplodePacket : public Packet, public std::enable_shared_from_this<ExplodePacket>
 {
 public:
 	double x, y, z;
diff --git a/Minecraft.World/Network/Packets/GameCommandPacket.h b/Minecraft.World/Network/Packets/GameCommandPacket.h
index c353622e0..a4aac45fd 100644
--- a/Minecraft.World/Network/Packets/GameCommandPacket.h
+++ b/Minecraft.World/Network/Packets/GameCommandPacket.h
@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Commands/CommandsEnum.h"
 #include "Packet.h"
 
-class GameCommandPacket : public Packet, public enable_shared_from_this<GameCommandPacket>
+class GameCommandPacket : public Packet, public std::enable_shared_from_this<GameCommandPacket>
 {
 public:
 	EGameCommand command;
diff --git a/Minecraft.World/Network/Packets/GameEventPacket.h b/Minecraft.World/Network/Packets/GameEventPacket.h
index 8f54a91e9..f9e1f50b3 100644
--- a/Minecraft.World/Network/Packets/GameEventPacket.h
+++ b/Minecraft.World/Network/Packets/GameEventPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class GameEventPacket : public Packet, public enable_shared_from_this<GameEventPacket>
+class GameEventPacket : public Packet, public std::enable_shared_from_this<GameEventPacket>
 {
 
 public:
diff --git a/Minecraft.World/Network/Packets/GetInfoPacket.h b/Minecraft.World/Network/Packets/GetInfoPacket.h
index cdeb51704..c44fa735b 100644
--- a/Minecraft.World/Network/Packets/GetInfoPacket.h
+++ b/Minecraft.World/Network/Packets/GetInfoPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class GetInfoPacket : public Packet, public enable_shared_from_this<GetInfoPacket>
+class GetInfoPacket : public Packet, public std::enable_shared_from_this<GetInfoPacket>
 {
 public:
 	virtual void read(DataInputStream *dis);
diff --git a/Minecraft.World/Network/Packets/InteractPacket.h b/Minecraft.World/Network/Packets/InteractPacket.h
index 97b40fa04..1af15bf23 100644
--- a/Minecraft.World/Network/Packets/InteractPacket.h
+++ b/Minecraft.World/Network/Packets/InteractPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class InteractPacket : public Packet, public enable_shared_from_this<InteractPacket>
+class InteractPacket : public Packet, public std::enable_shared_from_this<InteractPacket>
 {
 public:
 	static const int INTERACT;
diff --git a/Minecraft.World/Network/Packets/KeepAlivePacket.h b/Minecraft.World/Network/Packets/KeepAlivePacket.h
index d05e76d4b..5c7ce5cdf 100644
--- a/Minecraft.World/Network/Packets/KeepAlivePacket.h
+++ b/Minecraft.World/Network/Packets/KeepAlivePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class KeepAlivePacket : public Packet, public enable_shared_from_this<KeepAlivePacket>
+class KeepAlivePacket : public Packet, public std::enable_shared_from_this<KeepAlivePacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/KickPlayerPacket.h b/Minecraft.World/Network/Packets/KickPlayerPacket.h
index 62dd0dd19..5193f96aa 100644
--- a/Minecraft.World/Network/Packets/KickPlayerPacket.h
+++ b/Minecraft.World/Network/Packets/KickPlayerPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class KickPlayerPacket : public Packet, public enable_shared_from_this<KickPlayerPacket>
+class KickPlayerPacket : public Packet, public std::enable_shared_from_this<KickPlayerPacket>
 {
 public:
 	BYTE m_networkSmallId;
diff --git a/Minecraft.World/Network/Packets/LevelEventPacket.h b/Minecraft.World/Network/Packets/LevelEventPacket.h
index 78da348a7..d0f0aeb04 100644
--- a/Minecraft.World/Network/Packets/LevelEventPacket.h
+++ b/Minecraft.World/Network/Packets/LevelEventPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class LevelEventPacket : public Packet, public enable_shared_from_this<LevelEventPacket>
+class LevelEventPacket : public Packet, public std::enable_shared_from_this<LevelEventPacket>
 {
 public:
 	int type;
diff --git a/Minecraft.World/Network/Packets/LevelSoundPacket.h b/Minecraft.World/Network/Packets/LevelSoundPacket.h
index 4e6ede725..a11a923bd 100644
--- a/Minecraft.World/Network/Packets/LevelSoundPacket.h
+++ b/Minecraft.World/Network/Packets/LevelSoundPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class LevelSoundPacket : public Packet, public enable_shared_from_this<LevelSoundPacket>
+class LevelSoundPacket : public Packet, public std::enable_shared_from_this<LevelSoundPacket>
 {
 public:
 	static const float PITCH_ACCURACY;
diff --git a/Minecraft.World/Network/Packets/LoginPacket.h b/Minecraft.World/Network/Packets/LoginPacket.h
index 08709fbee..e9e36d5c3 100644
--- a/Minecraft.World/Network/Packets/LoginPacket.h
+++ b/Minecraft.World/Network/Packets/LoginPacket.h
@@ -4,7 +4,7 @@ using namespace std;
 #include "Packet.h"
 class LevelType;
 
-class LoginPacket : public Packet, public enable_shared_from_this<LoginPacket>
+class LoginPacket : public Packet, public std::enable_shared_from_this<LoginPacket>
 {
 public:
 	int clientVersion;
diff --git a/Minecraft.World/Network/Packets/MoveEntityPacket.h b/Minecraft.World/Network/Packets/MoveEntityPacket.h
index 7dbe0c29c..4be446787 100644
--- a/Minecraft.World/Network/Packets/MoveEntityPacket.h
+++ b/Minecraft.World/Network/Packets/MoveEntityPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MoveEntityPacket : public Packet, public enable_shared_from_this<MoveEntityPacket>
+class MoveEntityPacket : public Packet, public std::enable_shared_from_this<MoveEntityPacket>
 {
 
 	// 4J JEV, static inner/sub classes
diff --git a/Minecraft.World/Network/Packets/MoveEntityPacketSmall.h b/Minecraft.World/Network/Packets/MoveEntityPacketSmall.h
index 2fc54dd65..92fbd2578 100644
--- a/Minecraft.World/Network/Packets/MoveEntityPacketSmall.h
+++ b/Minecraft.World/Network/Packets/MoveEntityPacketSmall.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MoveEntityPacketSmall : public Packet, public enable_shared_from_this<MoveEntityPacketSmall>
+class MoveEntityPacketSmall : public Packet, public std::enable_shared_from_this<MoveEntityPacketSmall>
 {
 
 	// 4J JEV, static inner/sub classes
diff --git a/Minecraft.World/Network/Packets/MovePlayerPacket.h b/Minecraft.World/Network/Packets/MovePlayerPacket.h
index d91c0c377..dfdeec28d 100644
--- a/Minecraft.World/Network/Packets/MovePlayerPacket.h
+++ b/Minecraft.World/Network/Packets/MovePlayerPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MovePlayerPacket : public Packet, public enable_shared_from_this<MovePlayerPacket>
+class MovePlayerPacket : public Packet, public std::enable_shared_from_this<MovePlayerPacket>
 {
 public:
 	class PosRot;
diff --git a/Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h b/Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h
index 42f82a5dd..72efad344 100644
--- a/Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h
+++ b/Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h
@@ -4,7 +4,7 @@
 
 class Abilities;
 
-class PlayerAbilitiesPacket : public Packet, public enable_shared_from_this<PlayerAbilitiesPacket>
+class PlayerAbilitiesPacket : public Packet, public std::enable_shared_from_this<PlayerAbilitiesPacket>
 {
 private:
 	static const int FLAG_INVULNERABLE = 1 << 0;
diff --git a/Minecraft.World/Network/Packets/PlayerActionPacket.h b/Minecraft.World/Network/Packets/PlayerActionPacket.h
index 35221628c..9f434e3a3 100644
--- a/Minecraft.World/Network/Packets/PlayerActionPacket.h
+++ b/Minecraft.World/Network/Packets/PlayerActionPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerActionPacket : public Packet, public enable_shared_from_this<PlayerActionPacket>
+class PlayerActionPacket : public Packet, public std::enable_shared_from_this<PlayerActionPacket>
 {
 public:
 	static const int START_DESTROY_BLOCK;
diff --git a/Minecraft.World/Network/Packets/PlayerCommandPacket.h b/Minecraft.World/Network/Packets/PlayerCommandPacket.h
index 5e5583581..db74d690c 100644
--- a/Minecraft.World/Network/Packets/PlayerCommandPacket.h
+++ b/Minecraft.World/Network/Packets/PlayerCommandPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerCommandPacket : public Packet, public enable_shared_from_this<PlayerCommandPacket>
+class PlayerCommandPacket : public Packet, public std::enable_shared_from_this<PlayerCommandPacket>
 {
 public:
 	static const int START_SNEAKING;
diff --git a/Minecraft.World/Network/Packets/PlayerInfoPacket.h b/Minecraft.World/Network/Packets/PlayerInfoPacket.h
index d7724e83a..5561cf11f 100644
--- a/Minecraft.World/Network/Packets/PlayerInfoPacket.h
+++ b/Minecraft.World/Network/Packets/PlayerInfoPacket.h
@@ -4,7 +4,7 @@ using namespace std;
 
 class ServerPlayer;
 
-class PlayerInfoPacket : public Packet, public enable_shared_from_this<PlayerInfoPacket>
+class PlayerInfoPacket : public Packet, public std::enable_shared_from_this<PlayerInfoPacket>
 {
 	public:
 		// 4J Stu - I have re-purposed this packet for our uses
diff --git a/Minecraft.World/Network/Packets/PlayerInputPacket.h b/Minecraft.World/Network/Packets/PlayerInputPacket.h
index 93bbf7977..db15afa13 100644
--- a/Minecraft.World/Network/Packets/PlayerInputPacket.h
+++ b/Minecraft.World/Network/Packets/PlayerInputPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerInputPacket : public Packet, public enable_shared_from_this<PlayerInputPacket>
+class PlayerInputPacket : public Packet, public std::enable_shared_from_this<PlayerInputPacket>
 {
 
 private:
diff --git a/Minecraft.World/Network/Packets/PreLoginPacket.h b/Minecraft.World/Network/Packets/PreLoginPacket.h
index 9b12d78b7..78d653792 100644
--- a/Minecraft.World/Network/Packets/PreLoginPacket.h
+++ b/Minecraft.World/Network/Packets/PreLoginPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PreLoginPacket : public Packet, public enable_shared_from_this<PreLoginPacket>
+class PreLoginPacket : public Packet, public std::enable_shared_from_this<PreLoginPacket>
 {
     // the login key is username client->server and sessionid server->client
 public:
diff --git a/Minecraft.World/Network/Packets/RemoveEntitiesPacket.h b/Minecraft.World/Network/Packets/RemoveEntitiesPacket.h
index 7d9bd15f1..edbb6a4a9 100644
--- a/Minecraft.World/Network/Packets/RemoveEntitiesPacket.h
+++ b/Minecraft.World/Network/Packets/RemoveEntitiesPacket.h
@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Util/BasicTypeContainers.h"
 #include "Packet.h"
 
-class RemoveEntitiesPacket : public Packet, public enable_shared_from_this<RemoveEntitiesPacket>
+class RemoveEntitiesPacket : public Packet, public std::enable_shared_from_this<RemoveEntitiesPacket>
 {
 public:
 	static const int MAX_PER_PACKET = Byte::MAX_VALUE;
diff --git a/Minecraft.World/Network/Packets/RemoveMobEffectPacket.h b/Minecraft.World/Network/Packets/RemoveMobEffectPacket.h
index ade1ed1b1..e069baa9a 100644
--- a/Minecraft.World/Network/Packets/RemoveMobEffectPacket.h
+++ b/Minecraft.World/Network/Packets/RemoveMobEffectPacket.h
@@ -4,7 +4,7 @@ class MobEffectInstance;
 
 #include "Packet.h"
 
-class RemoveMobEffectPacket : public Packet, public enable_shared_from_this<RemoveMobEffectPacket>
+class RemoveMobEffectPacket : public Packet, public std::enable_shared_from_this<RemoveMobEffectPacket>
 {
 	public:
 		int entityId;
diff --git a/Minecraft.World/Network/Packets/RespawnPacket.h b/Minecraft.World/Network/Packets/RespawnPacket.h
index fb9fb0946..b9ed1665f 100644
--- a/Minecraft.World/Network/Packets/RespawnPacket.h
+++ b/Minecraft.World/Network/Packets/RespawnPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 class LevelType;
 class GameType;
 
-class RespawnPacket : public Packet, public enable_shared_from_this<RespawnPacket>
+class RespawnPacket : public Packet, public std::enable_shared_from_this<RespawnPacket>
 {
 public:
 	char dimension;
diff --git a/Minecraft.World/Network/Packets/RotateHeadPacket.h b/Minecraft.World/Network/Packets/RotateHeadPacket.h
index 8fffaf66d..7d3dc84bc 100644
--- a/Minecraft.World/Network/Packets/RotateHeadPacket.h
+++ b/Minecraft.World/Network/Packets/RotateHeadPacket.h
@@ -4,7 +4,7 @@
 #include "PacketListener.h"
 #include "Packet.h"
 
-class RotateHeadPacket : public Packet, public enable_shared_from_this<RotateHeadPacket>
+class RotateHeadPacket : public Packet, public std::enable_shared_from_this<RotateHeadPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h b/Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h
index b929348fc..87a570b66 100644
--- a/Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h
+++ b/Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ServerSettingsChangedPacket : public Packet, public enable_shared_from_this<ServerSettingsChangedPacket>
+class ServerSettingsChangedPacket : public Packet, public std::enable_shared_from_this<ServerSettingsChangedPacket>
 {
 public:
 	static const int HOST_DIFFICULTY;
diff --git a/Minecraft.World/Network/Packets/SetCarriedItemPacket.h b/Minecraft.World/Network/Packets/SetCarriedItemPacket.h
index d9b6c94ae..07676aeff 100644
--- a/Minecraft.World/Network/Packets/SetCarriedItemPacket.h
+++ b/Minecraft.World/Network/Packets/SetCarriedItemPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetCarriedItemPacket : public Packet, public enable_shared_from_this<SetCarriedItemPacket>
+class SetCarriedItemPacket : public Packet, public std::enable_shared_from_this<SetCarriedItemPacket>
 {
 public:
 	int slot;
diff --git a/Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h b/Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h
index ca46bf989..81edf128a 100644
--- a/Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h
+++ b/Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class SetCreativeModeSlotPacket : public Packet, public enable_shared_from_this<SetCreativeModeSlotPacket>
+class SetCreativeModeSlotPacket : public Packet, public std::enable_shared_from_this<SetCreativeModeSlotPacket>
 {
 	public:
 		int slotNum;
diff --git a/Minecraft.World/Network/Packets/SetEntityDataPacket.h b/Minecraft.World/Network/Packets/SetEntityDataPacket.h
index 445cfae1a..d8a009d02 100644
--- a/Minecraft.World/Network/Packets/SetEntityDataPacket.h
+++ b/Minecraft.World/Network/Packets/SetEntityDataPacket.h
@@ -4,7 +4,7 @@ using namespace std;
 #include "Packet.h"
 #include "../../Entities/SyncedEntityData.h"
 
-class SetEntityDataPacket : public Packet, public enable_shared_from_this<SetEntityDataPacket>
+class SetEntityDataPacket : public Packet, public std::enable_shared_from_this<SetEntityDataPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/SetEntityMotionPacket.h b/Minecraft.World/Network/Packets/SetEntityMotionPacket.h
index ef9fefc56..0aea43220 100644
--- a/Minecraft.World/Network/Packets/SetEntityMotionPacket.h
+++ b/Minecraft.World/Network/Packets/SetEntityMotionPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetEntityMotionPacket : public Packet, public enable_shared_from_this<SetEntityMotionPacket>
+class SetEntityMotionPacket : public Packet, public std::enable_shared_from_this<SetEntityMotionPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/SetEquippedItemPacket.h b/Minecraft.World/Network/Packets/SetEquippedItemPacket.h
index e957968b9..89b3ac3d3 100644
--- a/Minecraft.World/Network/Packets/SetEquippedItemPacket.h
+++ b/Minecraft.World/Network/Packets/SetEquippedItemPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetEquippedItemPacket : public Packet, public enable_shared_from_this<SetEquippedItemPacket>
+class SetEquippedItemPacket : public Packet, public std::enable_shared_from_this<SetEquippedItemPacket>
 {
 public:
 	int entity;
diff --git a/Minecraft.World/Network/Packets/SetExperiencePacket.h b/Minecraft.World/Network/Packets/SetExperiencePacket.h
index c8aff620f..86c13e842 100644
--- a/Minecraft.World/Network/Packets/SetExperiencePacket.h
+++ b/Minecraft.World/Network/Packets/SetExperiencePacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class SetExperiencePacket : public Packet, public enable_shared_from_this<SetExperiencePacket>
+class SetExperiencePacket : public Packet, public std::enable_shared_from_this<SetExperiencePacket>
 {
 public:
 	float experienceProgress;
diff --git a/Minecraft.World/Network/Packets/SetHealthPacket.h b/Minecraft.World/Network/Packets/SetHealthPacket.h
index 0f74075bf..1a6c09acf 100644
--- a/Minecraft.World/Network/Packets/SetHealthPacket.h
+++ b/Minecraft.World/Network/Packets/SetHealthPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetHealthPacket : public Packet, public enable_shared_from_this<SetHealthPacket>
+class SetHealthPacket : public Packet, public std::enable_shared_from_this<SetHealthPacket>
 {
 public:
 	int health;
diff --git a/Minecraft.World/Network/Packets/SetRidingPacket.h b/Minecraft.World/Network/Packets/SetRidingPacket.h
index 049b9d136..25a3f046a 100644
--- a/Minecraft.World/Network/Packets/SetRidingPacket.h
+++ b/Minecraft.World/Network/Packets/SetRidingPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetRidingPacket : public Packet, public enable_shared_from_this<SetRidingPacket>
+class SetRidingPacket : public Packet, public std::enable_shared_from_this<SetRidingPacket>
 {
 public:
 	int riderId, riddenId;
diff --git a/Minecraft.World/Network/Packets/SetSpawnPositionPacket.h b/Minecraft.World/Network/Packets/SetSpawnPositionPacket.h
index e9e5c7cdc..ea7e3e6ff 100644
--- a/Minecraft.World/Network/Packets/SetSpawnPositionPacket.h
+++ b/Minecraft.World/Network/Packets/SetSpawnPositionPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetSpawnPositionPacket : public Packet, public enable_shared_from_this<SetSpawnPositionPacket>
+class SetSpawnPositionPacket : public Packet, public std::enable_shared_from_this<SetSpawnPositionPacket>
 {
 public:
 	int x, y, z;
diff --git a/Minecraft.World/Network/Packets/SetTimePacket.h b/Minecraft.World/Network/Packets/SetTimePacket.h
index 17921bc5b..6686b3efa 100644
--- a/Minecraft.World/Network/Packets/SetTimePacket.h
+++ b/Minecraft.World/Network/Packets/SetTimePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetTimePacket : public Packet, public enable_shared_from_this<SetTimePacket>
+class SetTimePacket : public Packet, public std::enable_shared_from_this<SetTimePacket>
 {
 public:
 	__int64 time;
diff --git a/Minecraft.World/Network/Packets/SignUpdatePacket.h b/Minecraft.World/Network/Packets/SignUpdatePacket.h
index 339fd46fc..ae3a5835f 100644
--- a/Minecraft.World/Network/Packets/SignUpdatePacket.h
+++ b/Minecraft.World/Network/Packets/SignUpdatePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SignUpdatePacket : public Packet, public enable_shared_from_this<SignUpdatePacket>
+class SignUpdatePacket : public Packet, public std::enable_shared_from_this<SignUpdatePacket>
 {
 public:
 	int x, y, z;
diff --git a/Minecraft.World/Network/Packets/TakeItemEntityPacket.h b/Minecraft.World/Network/Packets/TakeItemEntityPacket.h
index da7856966..8b09ab8ff 100644
--- a/Minecraft.World/Network/Packets/TakeItemEntityPacket.h
+++ b/Minecraft.World/Network/Packets/TakeItemEntityPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TakeItemEntityPacket : public Packet, public enable_shared_from_this<TakeItemEntityPacket>
+class TakeItemEntityPacket : public Packet, public std::enable_shared_from_this<TakeItemEntityPacket>
 {
 public:
 	int itemId, playerId;
diff --git a/Minecraft.World/Network/Packets/TeleportEntityPacket.h b/Minecraft.World/Network/Packets/TeleportEntityPacket.h
index bb2efebd1..af36bd93a 100644
--- a/Minecraft.World/Network/Packets/TeleportEntityPacket.h
+++ b/Minecraft.World/Network/Packets/TeleportEntityPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TeleportEntityPacket : public Packet, public enable_shared_from_this<TeleportEntityPacket>
+class TeleportEntityPacket : public Packet, public std::enable_shared_from_this<TeleportEntityPacket>
 {
 public:
 	int id;
diff --git a/Minecraft.World/Network/Packets/TextureAndGeometryChangePacket.h b/Minecraft.World/Network/Packets/TextureAndGeometryChangePacket.h
index 1a83be0a8..5ea96ca1d 100644
--- a/Minecraft.World/Network/Packets/TextureAndGeometryChangePacket.h
+++ b/Minecraft.World/Network/Packets/TextureAndGeometryChangePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TextureAndGeometryChangePacket : public Packet, public enable_shared_from_this<TextureAndGeometryChangePacket>
+class TextureAndGeometryChangePacket : public Packet, public std::enable_shared_from_this<TextureAndGeometryChangePacket>
 {
 public:
 
diff --git a/Minecraft.World/Network/Packets/TextureAndGeometryPacket.h b/Minecraft.World/Network/Packets/TextureAndGeometryPacket.h
index b4ef5f6b2..13cfb60fb 100644
--- a/Minecraft.World/Network/Packets/TextureAndGeometryPacket.h
+++ b/Minecraft.World/Network/Packets/TextureAndGeometryPacket.h
@@ -7,7 +7,7 @@ using namespace std;
 
 class DLCSkinFile;
 
-class TextureAndGeometryPacket : public Packet, public enable_shared_from_this<TextureAndGeometryPacket>
+class TextureAndGeometryPacket : public Packet, public std::enable_shared_from_this<TextureAndGeometryPacket>
 {
 public:
 	std::wstring textureName;
diff --git a/Minecraft.World/Network/Packets/TextureChangePacket.h b/Minecraft.World/Network/Packets/TextureChangePacket.h
index 9fa86418a..5af0624c4 100644
--- a/Minecraft.World/Network/Packets/TextureChangePacket.h
+++ b/Minecraft.World/Network/Packets/TextureChangePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TextureChangePacket : public Packet, public enable_shared_from_this<TextureChangePacket>
+class TextureChangePacket : public Packet, public std::enable_shared_from_this<TextureChangePacket>
 {
 public:
 	enum ETextureChangeType
diff --git a/Minecraft.World/Network/Packets/TexturePacket.h b/Minecraft.World/Network/Packets/TexturePacket.h
index 2aee039bf..c759e6d8c 100644
--- a/Minecraft.World/Network/Packets/TexturePacket.h
+++ b/Minecraft.World/Network/Packets/TexturePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TexturePacket : public Packet, public enable_shared_from_this<TexturePacket>
+class TexturePacket : public Packet, public std::enable_shared_from_this<TexturePacket>
 {
 public:
 	std::wstring textureName;
diff --git a/Minecraft.World/Network/Packets/TileDestructionPacket.h b/Minecraft.World/Network/Packets/TileDestructionPacket.h
index 394ffaa11..a0a8cf64f 100644
--- a/Minecraft.World/Network/Packets/TileDestructionPacket.h
+++ b/Minecraft.World/Network/Packets/TileDestructionPacket.h
@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class TileDestructionPacket : public Packet, public enable_shared_from_this<TileDestructionPacket>
+class TileDestructionPacket : public Packet, public std::enable_shared_from_this<TileDestructionPacket>
 {
 private:
 	int id;
diff --git a/Minecraft.World/Network/Packets/TileEntityDataPacket.h b/Minecraft.World/Network/Packets/TileEntityDataPacket.h
index 522392edf..61d712315 100644
--- a/Minecraft.World/Network/Packets/TileEntityDataPacket.h
+++ b/Minecraft.World/Network/Packets/TileEntityDataPacket.h
@@ -5,7 +5,7 @@ using namespace std;
 
 class CompoundTag;
 
-class TileEntityDataPacket : public Packet, public enable_shared_from_this<TileEntityDataPacket>
+class TileEntityDataPacket : public Packet, public std::enable_shared_from_this<TileEntityDataPacket>
 {
 public:
 	static const int TYPE_MOB_SPAWNER = 1;
diff --git a/Minecraft.World/Network/Packets/TileEventPacket.h b/Minecraft.World/Network/Packets/TileEventPacket.h
index b1d60bad8..ac2b98310 100644
--- a/Minecraft.World/Network/Packets/TileEventPacket.h
+++ b/Minecraft.World/Network/Packets/TileEventPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TileEventPacket : public Packet, public enable_shared_from_this<TileEventPacket>
+class TileEventPacket : public Packet, public std::enable_shared_from_this<TileEventPacket>
 {
 public:
 	int x, y, z, b0, b1, tile;
diff --git a/Minecraft.World/Network/Packets/TileUpdatePacket.h b/Minecraft.World/Network/Packets/TileUpdatePacket.h
index 4ed1a9c80..681c3e8db 100644
--- a/Minecraft.World/Network/Packets/TileUpdatePacket.h
+++ b/Minecraft.World/Network/Packets/TileUpdatePacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TileUpdatePacket : public Packet, public enable_shared_from_this<TileUpdatePacket>
+class TileUpdatePacket : public Packet, public std::enable_shared_from_this<TileUpdatePacket>
 {
 public:
 	int x, y, z;
diff --git a/Minecraft.World/Network/Packets/TradeItemPacket.h b/Minecraft.World/Network/Packets/TradeItemPacket.h
index 9923f96e3..6c631da39 100644
--- a/Minecraft.World/Network/Packets/TradeItemPacket.h
+++ b/Minecraft.World/Network/Packets/TradeItemPacket.h
@@ -10,7 +10,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class TradeItemPacket : public Packet, public enable_shared_from_this<TradeItemPacket>
+class TradeItemPacket : public Packet, public std::enable_shared_from_this<TradeItemPacket>
 {
 public:
     int containerId;
diff --git a/Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h b/Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h
index c68edd9af..44b142600 100644
--- a/Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h
+++ b/Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class UpdateGameRuleProgressPacket : public Packet, public enable_shared_from_this<UpdateGameRuleProgressPacket>
+class UpdateGameRuleProgressPacket : public Packet, public std::enable_shared_from_this<UpdateGameRuleProgressPacket>
 {
 public:
 	ConsoleGameRules::EGameRuleType m_definitionType;
diff --git a/Minecraft.World/Network/Packets/UpdateMobEffectPacket.h b/Minecraft.World/Network/Packets/UpdateMobEffectPacket.h
index a69d32b23..0eeed4dc1 100644
--- a/Minecraft.World/Network/Packets/UpdateMobEffectPacket.h
+++ b/Minecraft.World/Network/Packets/UpdateMobEffectPacket.h
@@ -4,7 +4,7 @@
 
 class MobEffectInstance;
 
-class UpdateMobEffectPacket : public Packet, public enable_shared_from_this<UpdateMobEffectPacket>
+class UpdateMobEffectPacket : public Packet, public std::enable_shared_from_this<UpdateMobEffectPacket>
 {
 public:
 	int entityId;
diff --git a/Minecraft.World/Network/Packets/UpdateProgressPacket.h b/Minecraft.World/Network/Packets/UpdateProgressPacket.h
index edfaef961..4d77125fe 100644
--- a/Minecraft.World/Network/Packets/UpdateProgressPacket.h
+++ b/Minecraft.World/Network/Packets/UpdateProgressPacket.h
@@ -5,7 +5,7 @@ using namespace std;
 
 // 4J Added packet to update clients on the time for the host to finish doing something
 
-class UpdateProgressPacket : public Packet, public enable_shared_from_this<UpdateProgressPacket>
+class UpdateProgressPacket : public Packet, public std::enable_shared_from_this<UpdateProgressPacket>
 {
 
 public:
diff --git a/Minecraft.World/Network/Packets/UseItemPacket.h b/Minecraft.World/Network/Packets/UseItemPacket.h
index 2619ce94e..b217187d2 100644
--- a/Minecraft.World/Network/Packets/UseItemPacket.h
+++ b/Minecraft.World/Network/Packets/UseItemPacket.h
@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class UseItemPacket : public Packet, public enable_shared_from_this<UseItemPacket>
+class UseItemPacket : public Packet, public std::enable_shared_from_this<UseItemPacket>
 {
 private:
 	static const float CLICK_ACCURACY;
diff --git a/Minecraft.World/Network/Packets/XZPacket.h b/Minecraft.World/Network/Packets/XZPacket.h
index 4154084f2..801d99a15 100644
--- a/Minecraft.World/Network/Packets/XZPacket.h
+++ b/Minecraft.World/Network/Packets/XZPacket.h
@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class XZPacket : public Packet, public enable_shared_from_this<XZPacket>
+class XZPacket : public Packet, public std::enable_shared_from_this<XZPacket>
 {
 public:
 	static const int STRONGHOLD;