Several header fixes

Guidelines are important: http://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Headers.html