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