fix for build error introduced with latest change (forgot to commit types.h)
Merge branch 'hotfix' into refactor