Rearrange headers.
Fix install locations for libraries for mingw.
Fix spaces.