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

Change-Id: I59fa9af7b16e0a5a4eb8a5cc764a605b18137316