Merge "Remove incorrect forward declaration"