Fixes includes (codegeneration included everywhere)
Merge pull request #200 from lordgeorg/master

Fixes includes (codegeneration included everywhere)