We made every living thing from water. Are Jinns "living" things?

The Qur'an says: > And that We have made every living thing out of water [21:30 ] Aren't jinn *living things*? What are they made of? Isn't it a contradiction with the the following verse? > and the jinn We had created before from flaming fire. [15:27 ]