Changed CMakeLists.txt to include all the includes