Fix "attempted duplicate class definition" errors