Windows: more roken.h include corrections