Merge pull request #3809 from lateralusX/jlorenss/win-api-family-support-cleanup