various include fixes

Change-Id: Id53c85e7322cff7e7fb8b9f260e4f491119b399f
2 files changed