Adding forward declarations and include files