Merge "Pass phpcs-strict on various files in includes/"