Drop unused #includes

Change-Id: I77ca957204bacee95e32a7f2a54c9311002aeef9