Cleaned up and improved how files are included from CMakeLists_files.cmake
p4#: 20616