Removed dead code.
Merge pull request #263 from murrekatt/cleanup

Removed dead code.
cppcheck: update includes
Merge pull request #264 from toxeus/updateCppcheckIncludes

cppcheck: update includes