cleaned up cyclus.cc includes