Fix win-guid definitions