Cleaned up some more dependencies on Wine internal functions.

13 files changed