Explicitly require cl-lib wherever it's used.

Don't depend on other files to load cl-lib, because whether a file
uses it or not is an implementation detail.

Also, remove a (require 'cl) introduced in c3a44b6bd23ea.