Fix includes normalize win32#2723

lygstate wants to merge 4 commits intoninja-build:masterninja-build/ninja:masterfrom

lygstate:normalize_fixedlygstate/ninja:normalize_fixedCopy head branch name to clipboard