Some more Win16/Win32 separation (based on a patch by Steven