Fix header declarations.