global commit_headers! considered harmful