Removed some duplicate includes