Cleanup for MSVC+MingW.

Fixed building for MingW+MSVC. Those seems to have fallen behind. Adding a single GNU makefile for both MSVC+MingW soon. Note: a lot of white-space changes. (trailing WS removed).