Removed cyclic header file dependency.