Updated CMake and fixed include paths

* removed unneeded paths in includes