This required a fair bit of surgery because previously ostree.h included otutil.h, but that's supposed to be a private library.