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

28 jobs for master
in 43 minutes and 24 seconds and was queued for 5 seconds
Scheduled