Take the chance to update some includes using files available in that subdir to have them ina more uniform way. Change-Id: Ibda3c54fd4dc3f6b845cc373f1a1e6b758c1ea82
Change-Id: Ie682abf7e83de436d0f37f9f6e0664cb2f4d0c9e