Corrected the CMakeLists file to include the correct header files for generate & fill