He scored on his senior international debut on Friday.
The big fitness concern for Wales is over midfielder Joe Ledley – who's been recovering from a broken leg.
Chris Coleman's squad will be named at 2-30.
Meanwhile, Arsenal full-back Hector Bellerin has been named in Spain's squad – having been excluded from the initial group.
He takes the place of Real Madrid's Dani Carvajal – who was injured in Saturday's Champions League final win over Atletico Madrid.