fix includes
Merge branch 'future' of https://github.com/wallix/redemption into future