Update CMake files for new includes