Windows cf-upgrade: make re-execute command line construction more clear.
Fix order of includes.