Only updated the cmakelists.txt files to add all the "new" headers.