removed circular reference from header files