Fix CMakeLists (order of include, and remove include paths from files to be compiled by library).

Merged Simon Morlat requested to merge fix/cmakelists_fixes into master

Merge request reports