try to fix dependency analyser warnings
Merge branch 'master' of https://github.com/wenns/sonar-cxx