Do not use HeurCalculator::Ptr
Remove some header dependencies from MovableChecker