Drop original includes and registration, add Registry:: calls.
Drop original includes and registration, add Registry:: calls.

shannon-lab/zapdos,shannon-lab/zapdos,lindsayad/zapdos,lindsayad/zapdos,lindsayad/zapdos,shannon-lab/zapdos