Merge branch 'da/include-compat-util-first-in-c'

Code clean-up. * da/include-compat-util-first-in-c: cleanups: ensure that git-compat-util.h is included first