Eliminate redundant #includes and a missing one

Minor cleanup that fell out of a debugging effort.
Test:  Build and run vehicle hal on gordon peak

Change-Id: I29bcb74f3eac96df303139b2717b06c8dfedb839
3 files changed