Merge branch 'jc/no-include-of-compat-util-from-headers'

Header file clean-up. * jc/no-include-of-compat-util-from-headers: compat: drop inclusion of <git-compat-util.h>