Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55347
Fixes winrt headers for C++. This partially reverts commit a35ca9236275. I think that part of the change was a hack to work around an issue that was later resolved by 2a7940c97d4e. There was some [justification](https://www.winehq.org/mailman3/hyperkitty/list/wine-devel@winehq.org/messag...) explaining why it's acceptable to break C++ that I don't really understand.