Re #9483. Getting rid of cppcheck warnings.
Merge branch 'feature/9483_using_headers' into develop