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

Change-Id: I259f3f11cfc22f3ed1693f9ebd5bd80491b8a6e8