Minor changes. Unify include paths