fix tabs vs spaces, put includes in alpha order

Change-Id: Ia2ec5795ca7d0f51483fe6fe1767f904ee5d2081