remove win32 and X11 defines + cleanups