Changed inclusions of headers with forward declarations.