diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index f21ae8b83..977c29a62 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,8 +21,9 @@
 #include "AreaBoundary.h"
 #include "Common.h"
 #include "Creature.h"
-#include "UnitAI.h"
 #include "EventMap.h"
+#include "TaskScheduler.h"
+#include "UnitAI.h"
 
 class WorldObject;
 class Unit;
@@ -72,6 +73,7 @@ protected:
     Creature* const me;
 
     EventMap events;
+    TaskScheduler scheduler;
 
     bool UpdateVictim();
     bool UpdateVictimWithGaze();
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
index f260a39e4..07ed2c45e 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -494,9 +494,7 @@ protected:
 
     void TeleportCheaters();
 
-    EventMap events;
     SummonList summons;
-    TaskScheduler scheduler;
 
 private:
     uint32 const _bossId;