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