privat/nit — pull request #819 by privat (2014-10-11 17:25:25+00:00)
Title: src: remove some warnings and do some cleaning

Extracted from the first version of #817