Fixing duplicate includes