First round in include path updates