NXP-10984 better manage xs:import and xs:include