Include cleanup

This patch corrects the include generating warnings on build

Change-Id: I943da0ec630ec85a36c3be6dbb570ea90799678b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I222b3d468acbf45b1f7b81706e74db8c182869cd