cleaned up include files, with more to do