Fix boilerplate and add cl-lib package dependency for compatibility with package.el