* Branch merge

--HG--
branch : trunk

2 files changed, 7 insertions, 1 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 1a1fa3786ab..4e7cc120cc9 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -12,7 +12,7 @@
 #include "CompilerDefs.h"
 #include "DBCStructure.h"
 #include "ConfigEnv.h"
-
+#include "ObjectMgr.h"
 
 class Player;
 class Creature;
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index 73b378db20e..d80f3b5468d 100644
--- a/src/server/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
@@ -19,10 +19,16 @@
 #ifndef __SPELL_SCRIPT_H
 #define __SPELL_SCRIPT_H
 
+#include "SharedDefines.h"
+
 class Unit;
 struct SpellEntry;
 class SpellScript;
 class Spell;
+class Creature;
+class GameObject;
+class Player;
+class Item;
 
 typedef void(SpellScript::*EffectHandlerFnType)(SpellEffIndex);