Re: winres.h cleanup