Remove unnecessary forward declarations