Bugfix: missing includes