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

Change-Id: Iaf3120b4e32cc5835ef9ed86236d98679e2b87fa
Fix CodeSniffer errors and warnings in includes/specials (2)

Change-Id: I9787d2a1515b2a8d9310ea636650e20d041acc3d
Merge "Try to make a dent in CodeSniffer reports on includes/ (1)"
Merge "Fix CodeSniffer errors and warnings in includes/specials (2)"