Fix SDK/XPS development environment, to build without modification