Re: merge the crt and header packages