Update config

Changes in sources and config to solve compiling errors in Windows, please evaluate changes to be correct, patchset are in 3 sources.