typos, reduce mingw header diffs, extra includes.