Clean up includes

Remove two system files
Remove a circular include dependency by using a callback function

Change-Id: I159357b3a0ad06d0a7ebf45feb82989bcc1b303a
4 files changed