Clean up includes

Change-Id: Id3aaae19d86b706fd5ddb5982340472d28a75610