Remove superfluous include.
Add override specifier.
Add support for rule 6-2-1.