Updated CMakeLists.txt to add the two new files
Merge branch 'Feature_ForbidRelativePathInIncludes' into TempMergeBranch