Merge "Fix implicit function declarations."