diff --git a/ElunaUtility.h b/ElunaUtility.h
index 0b1bc13ff7..1b507c4ff0 100644
--- a/ElunaUtility.h
+++ b/ElunaUtility.h
@@ -17,18 +17,15 @@
 #if !defined CMANGOS
 #include "SharedDefines.h"
 #include "ObjectGuid.h"
-#else
-#include "Globals/SharedDefines.h"
-#include "Entities/ObjectGuid.h"
-#endif
-
+#include "Log.h"
 #if defined TRINITY
 #include "QueryResult.h"
-#include "Log.h"
-#elif defined VMANGOS
+#else
 #include "Database/QueryResult.h"
-#include "Log.h"
+#endif
 #else
+#include "Globals/SharedDefines.h"
+#include "Entities/ObjectGuid.h"
 #include "Database/QueryResult.h"
 #include "Log/Log.h"
 #endif
diff --git a/LuaEngine.h b/LuaEngine.h
index 89e53152d6..e6e05c1361 100644
--- a/LuaEngine.h
+++ b/LuaEngine.h
@@ -19,6 +19,9 @@
 #include "SharedDefines.h"
 #include "Weather.h"
 #include "World.h"
+#if defined VMANGOS
+#include "Player.h"
+#endif
 #else
 #include "Entities/Item.h"
 #include "Globals/SharedDefines.h"
@@ -27,16 +30,8 @@
 #include "Server/DBCEnums.h"
 #include "Weather/Weather.h"
 #include "World/World.h"
-#endif
-
-#if !defined TRINITY
-#if !defined CMANGOS
-#include "Player.h"
-#else
 #include "Entities/Player.h"
 #endif
-#endif
-
 
 #include <mutex>
 #include <memory>
@@ -88,7 +83,9 @@ typedef SpellEntry SpellInfo;
 #if defined CMANGOS
 class TemporarySpawn;
 typedef TemporarySpawn TempSummon;
-#else
+#endif
+
+#if defined VMANGOS
 class TemporarySummon;
 typedef TemporarySummon TempSummon;
 #endif
@@ -546,11 +543,9 @@ class ELUNA_GAME_API Eluna
     void OnCreate(Guild* guild, Player* leader, const std::string& name);
     void OnDisband(Guild* guild);
     void OnMemberWitdrawMoney(Guild* guild, Player* player, uint32& amount, bool isRepair);
-#if EXPANSION >= CATA
-    void OnMemberWitdrawMoney(Guild* guild, Player* player, uint64& amount, bool isRepair);
-#endif
     void OnMemberDepositMoney(Guild* guild, Player* player, uint32& amount);
 #if EXPANSION >= CATA
+    void OnMemberWitdrawMoney(Guild* guild, Player* player, uint64& amount, bool isRepair);
     void OnMemberDepositMoney(Guild* guild, Player* player, uint64& amount);
 #endif
     void OnItemMove(Guild* guild, Player* player, Item* pItem, bool isSrcBank, uint8 srcContainer, uint8 srcSlotId, bool isDestBank, uint8 destContainer, uint8 destSlotId);