bug/xsd-version-win7

fast merge (I just cleaned the continuous build dir on win7 VM to get a fresh xsd cxx include path)