Make headers conform to package.el requirements