More Win32 test fixes

Here are some more fixes for tests on Win32. Some are for converting to FileCheck because of problems with grep, others are for replacing problematic system header includes, or both.

-John

morewin32testfixes.patch (11.7 KB)