Removed unnecessary inclueds
User now can override --enable cppcheck options

Need for old versions of cppcheck that do not have some default --enable
option values. Now user can override them manually.
Indent fixed :)