Removed cyclic include dependency from header file