Replace forward declarations with actual header inclusions.