git-compat-util: move content inside ifdef/endif guards