WIN32: More ifdef cleanups