apparently i forgot to add/commit these comments...
Merge branch 'master' of https://github.com/irungentoo/toxcore
Fix include issue
Merge branch 'dubslow-master'