5 files changed, 16 insertions, 16 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp
index 655f85524..73d26eb27 100644
--- a/source/UI/SlotArea.cpp
+++ b/source/UI/SlotArea.cpp
@@ -5,13 +5,13 @@
 
 #include "Globals.h"
 #include "SlotArea.h"
-#include "../cPlayer.h"
-#include "../cChestEntity.h"
-#include "../cFurnaceEntity.h"
-#include "../Items/Item.h"
+#include "../Player.h"
+#include "../ChestEntity.h"
+#include "../FurnaceEntity.h"
+#include "../Items/ItemHandler.h"
 #include "Window.h"
 #include "../CraftingRecipes.h"
-#include "../cRoot.h"
+#include "../Root.h"
 
 
 
diff --git a/source/UI/SlotArea.h b/source/UI/SlotArea.h
index 79f95c5d5..e356fbdd8 100644
--- a/source/UI/SlotArea.h
+++ b/source/UI/SlotArea.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../cItem.h"
+#include "../Item.h"
 
 
 
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp
index e6c7a9feb..b3d72570c 100644
--- a/source/UI/Window.cpp
+++ b/source/UI/Window.cpp
@@ -2,15 +2,15 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Window.h"
-#include "../cItem.h"
-#include "../cClientHandle.h"
-#include "../cPlayer.h"
-#include "../cPickup.h"
-#include "../cInventory.h"
+#include "../Item.h"
+#include "../ClientHandle.h"
+#include "../Player.h"
+#include "../Pickup.h"
+#include "../Inventory.h"
 #include "WindowOwner.h"
-#include "../items/Item.h"
+#include "../items/ItemHandler.h"
 #include "SlotArea.h"
-#include "../cChestEntity.h"
+#include "../ChestEntity.h"
 
 
 
diff --git a/source/UI/Window.h b/source/UI/Window.h
index b3df1bc86..8caab3bd1 100644
--- a/source/UI/Window.h
+++ b/source/UI/Window.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../cItem.h"
+#include "../Item.h"
 
 
 
diff --git a/source/UI/WindowOwner.h b/source/UI/WindowOwner.h
index e0cc8da8a..7ad4a5739 100644
--- a/source/UI/WindowOwner.h
+++ b/source/UI/WindowOwner.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include "../cBlockEntity.h"
-#include "../cEntity.h"
+#include "../BlockEntity.h"
+#include "../Entity.h"
 #include "Window.h"
 
 /*