Cleaned up movement.h

Removed unused includes