Remove some Windows types and fix some warnings.