Unify winutil.h with its upstream copy.