Basic fixes for Windows Build

We could start doing it the correct way, don't you think?
I could fix the remaining defines then.