Further cleanup of cdefs for Windows.