Bug fix for GPU struct generation (omitting some header include statements)
Merge branch 'wip-clusters' into wip-clusters-lancet