Fix clean Windows build after r210029