Merge "Remove bogus forward declarations"