Replaced forward declarations with includes