No, don't include your housing. Just up your best cash/base salary in the US by 25%. Salaries in Qatar are stated in QR and by month, not year. I don't know about contracts, we signed our before coming.
Mandi