re-org internal heca include files (removing core.h)