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

Change-Id: Ib51381a2261d064988ba2f39b71c0252f2458faf