Update build env to fit new xpsave layout + fix small mistake in preprocessor defs.