updated cyclus.h and added missing headers in cmakelists