Eradicated some win32 macros/typedefs