Fix header and package directives.