add warning to catch a mover that is used multiple times
include correct header
clean up protection a bit