Include cleanup

This patch corrects the include generating warnings on build

Change-Id: I943da0ec630ec85a36c3be6dbb570ea90799678b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>