Remove some header dependencies from ExtendedMovableChecker