Merge branch 'feature/fix-headercheck' into 'master'

Fix includes etc. to make headercheck pass

This should solve #35 (closed) .

See merge request !108 (merged)

Enabled an automatic merge when the build for 84c29fc5 succeeds

Status changed to merged

Mentioned in commit 4c82dae4