Make phpcs-strict pass on includes/ (4/~10)

Change-Id: I2767205a7059adfb8fa090a82abd332e518f2590