Fix some broken includes
Merge branch 'master' of github.com:Kazade/kazbase