Delete includes

Change-Id: Ia596fd718d879d332f007515bb3af72518da81fd