flight support: include fixup
ivory: fixes for new addDepends style, task compilation units changing