various include fixes

Change-Id: Ic00be577eaf76395ec95b8f8a41c330006339f51
4 files changed