Correct namespace issues and rogue WIN_DLL references.