* Branch merge

--HG--
branch : trunk

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;

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);