Merge "Fix C compatibility in header."