Pass phpcs-strict on various files in includes/

These files have all had treatment before, and these occurrences have either
been missed or have been introduced after.

Change-Id: I06cdab4616b5bff47c85152df28f18c861730a23
Merge "Pass phpcs-strict on various files in includes/"