diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp
index 169d4fcd4..b58cf74a8 100644
--- a/src/game/ConfusedMovementGenerator.cpp
+++ b/src/game/ConfusedMovementGenerator.cpp
@@ -17,9 +17,9 @@
  */
 
 #include "ConfusedMovementGenerator.h"
-#include "Creature.h"
 #include "MapManager.h"
-#include "Opcodes.h"
+#include "Creature.h"
+#include "Player.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 
diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h
index b62ca1a1b..08995fa22 100644
--- a/src/game/ConfusedMovementGenerator.h
+++ b/src/game/ConfusedMovementGenerator.h
@@ -20,6 +20,7 @@
 #define MANGOS_CONFUSEDMOVEMENTGENERATOR_H
 
 #include "MovementGenerator.h"
+#include "Timer.h"
 
 #define MAX_CONF_WAYPOINTS 24
 
diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h
index 5a5c7fa8e..3e9c04116 100644
--- a/src/game/PointMovementGenerator.h
+++ b/src/game/PointMovementGenerator.h
@@ -21,6 +21,7 @@
 
 #include "MovementGenerator.h"
 #include "FollowerReference.h"
+#include "Creature.h"
 
 template<class T>
 class MANGOS_DLL_SPEC PointMovementGenerator
@@ -28,7 +29,7 @@ class MANGOS_DLL_SPEC PointMovementGenerator
 {
     public:
         PointMovementGenerator(uint32 _id, float _x, float _y, float _z) : id(_id),
-            i_x(_x), i_y(_y), i_z(_z), i_nextMoveTime(0) {}
+            i_x(_x), i_y(_y), i_z(_z) {}
 
         void Initialize(T &);
         void Finalize(T &);
@@ -44,7 +45,6 @@ class MANGOS_DLL_SPEC PointMovementGenerator
     private:
         uint32 id;
         float i_x,i_y,i_z;
-        TimeTracker i_nextMoveTime;
 };
 
 class MANGOS_DLL_SPEC AssistanceMovementGenerator
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
index f56b9ccce..049692f09 100644
--- a/src/game/TargetedMovementGenerator.cpp
+++ b/src/game/TargetedMovementGenerator.cpp
@@ -20,12 +20,11 @@
 #include "TargetedMovementGenerator.h"
 #include "Errors.h"
 #include "Creature.h"
+#include "Player.h"
 #include "World.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 
-#define SMALL_ALPHA 0.05f
-
 #include <cmath>
 
 //-----------------------------------------------//
diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h
index 68bb1f55a..693563070 100644
--- a/src/game/TargetedMovementGenerator.h
+++ b/src/game/TargetedMovementGenerator.h
@@ -21,6 +21,7 @@
 
 #include "MovementGenerator.h"
 #include "FollowerReference.h"
+#include "Timer.h"
 
 class MANGOS_DLL_SPEC TargetedMovementGeneratorBase
 {
diff --git a/src/game/movement/packet_builder.h b/src/game/movement/packet_builder.h
index 48043d9da..a831c3a62 100644
--- a/src/game/movement/packet_builder.h
+++ b/src/game/movement/packet_builder.h
@@ -24,6 +24,7 @@ class WorldPacket;
 
 namespace Movement
 {
+    class MoveSpline;
     class PacketBuilder
     {
         static void WriteCommonMonsterMovePart(const MoveSpline& mov, WorldPacket& data);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 9dd2e893e..ab21699b3 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 "11721"
+ #define REVISION_NR "11722"
 #endif // __REVISION_NR_H__