Merge to XFA: Remove rendundant ../include from paths.