fix mingw-linux out-of-source cross-build

Make works without errors now, make test doesn't yet.
These additional includes were not necessary for "normal" out-of-source
builds on Windows and Linux somehow.
Merge remote-tracking branch 'cmake/master'