Make headers conform more closely to Package.el spec

Needed for package building, same as previous PRs