Whiltespace
Fix VS codegen (invalid XML).
Update generated makefiles.