Merge "Try to make a dent in CodeSniffer reports on includes/ (1)"