Include optimisation