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

gridley/moltres,lindsayad/moltres,gridley/moltres,arfc/moltres,gridley/moltres,gridley/moltres,lindsayad/moltres,lindsayad/moltres,lindsayad/moltres,arfc/moltres,arfc/moltres,arfc/moltres