Re: PATCH - some build fixes for w32api headers