Fix compilations problems on Debian stable
This will create a new commit in order to revert the existing changes.
