Temporary added /emacs/*-cmpl.el from [master]
Cleanup autogenerated config headers