Tweaks include order in build-coa.make