Clean up win32 includes