fix missing includes
Merge branch 'master' of git://github.com/eressea/server