Remove Windows macros from non-Windows builds
Merge with master