diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h
index c6f57559c..8d28b555a 100644
--- a/src/game/DBCEnums.h
+++ b/src/game/DBCEnums.h
@@ -232,6 +232,21 @@ enum AreaFlags
     AREA_FLAG_OUTDOOR_PVP2     = 0x08000000                 // Wintergrasp and it's subzones
 };
 
+enum Difficulty
+{
+    DUNGEON_DIFFICULTY_NORMAL    = 0,
+    DUNGEON_DIFFICULTY_HEROIC    = 1,
+
+    RAID_DIFFICULTY_10MAN_NORMAL = 0,
+    RAID_DIFFICULTY_25MAN_NORMAL = 1,
+    RAID_DIFFICULTY_10MAN_HEROIC = 2,
+    RAID_DIFFICULTY_25MAN_HEROIC = 3,
+};
+
+#define MAX_DUNGEON_DIFFICULTY     2
+#define MAX_RAID_DIFFICULTY        4
+#define MAX_DIFFICULTY             4
+
 enum FactionTemplateFlags
 {
     FACTION_TEMPLATE_FLAG_CONTESTED_GUARD   =   0x00001000, // faction will attack players that were involved in PvP combats
diff --git a/src/game/Group.h b/src/game/Group.h
index 3b852fa8e..59af7d64f 100644
--- a/src/game/Group.h
+++ b/src/game/Group.h
@@ -23,6 +23,7 @@
 #include "GroupRefManager.h"
 #include "BattleGround.h"
 #include "LootMgr.h"
+#include "DBCEnums.h"
 
 #include <map>
 #include <vector>
diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h
index f1d08e8f2..d285f7a23 100644
--- a/src/game/InstanceSaveMgr.h
+++ b/src/game/InstanceSaveMgr.h
@@ -26,6 +26,7 @@
 #include <map>
 #include "Utilities/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
+#include "DBCEnums.h"
 
 struct InstanceTemplate;
 struct MapEntry;
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 623f70631..3e3e65082 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -50,6 +50,7 @@
 #include "InstanceSaveMgr.h"
 #include "InstanceData.h"
 #include "CreatureEventAIMgr.h"
+#include "DBCEnums.h"
 
 //reload commands
 bool ChatHandler::HandleReloadAllCommand(const char*)
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 7e4fdfba9..52a57efaf 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -34,6 +34,7 @@
 #include "ScriptCalls.h"
 #include "Group.h"
 #include "MapRefManager.h"
+#include "DBCEnums.h"
 
 #include "MapInstanced.h"
 #include "InstanceSaveMgr.h"
diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h
index baa78eeb6..b64bd91b5 100644
--- a/src/game/MapInstanced.h
+++ b/src/game/MapInstanced.h
@@ -21,6 +21,7 @@
 
 #include "Map.h"
 #include "InstanceSaveMgr.h"
+#include "DBCEnums.h"
 
 class MANGOS_DLL_DECL MapInstanced : public Map
 {
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 776277d2a..696563474 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -39,6 +39,7 @@
 #include "BattleGround.h"
 #include "Pet.h"
 #include "SocialMgr.h"
+#include "DBCEnums.h"
 
 void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
 {
@@ -1460,7 +1461,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode( WorldPacket & recv_data )
         return;
     }
 
-    if(RaidDifficulties(mode) == _player->GetRaidDifficulty())
+    if(Difficulty(mode) == _player->GetRaidDifficulty())
         return;
 
     // cannot reset while in an instance
diff --git a/src/game/Player.h b/src/game/Player.h
index 20835baf1..503cd4836 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -36,6 +36,7 @@
 #include "AchievementMgr.h"
 #include "ReputationMgr.h"
 #include "BattleGround.h"
+#include "DBCEnums.h"
 
 #include<string>
 #include<vector>
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 282791706..cbb57c7eb 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -2408,25 +2408,6 @@ enum DiminishingGroup
     DIMINISHING_LIMITONLY
 };
 
-enum Difficulty
-{
-    DUNGEON_DIFFICULTY_NORMAL    = 0,
-    DUNGEON_DIFFICULTY_HEROIC    = 1,
-
-    RAID_DIFFICULTY_10MAN_NORMAL = 0,
-    RAID_DIFFICULTY_25MAN_NORMAL = 1,
-    RAID_DIFFICULTY_10MAN_HEROIC = 2,
-    RAID_DIFFICULTY_25MAN_HEROIC = 3,
-};
-
-#define MAX_DUNGEON_DIFFICULTY     2
-#define MAX_RAID_DIFFICULTY        4
-#define MAX_DIFFICULTY             4
-
-enum RaidDifficulties
-{
-};
-
 enum SummonType
 {
     SUMMON_TYPE_CRITTER     = 41,
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 78be3ef88..652bf81a3 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8589"
+ #define REVISION_NR "8590"
 #endif // __REVISION_NR_H__