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

Change-Id: Ibf86d03b5479c47ee72c0dafea6777ef8178fe68