Remove unused #includes

Change-Id: I96775ac9a8624e12974c78c6abb93ddd80eed567