Update CMake lists of sources to include files added in r175787 and r175323