more win32 typedef removal