Merge branch 'cleanup/dumuxheaders' into 'master'

[Cleanup] Delete clutter after header guards

See merge request !104
2 jobs for master in 39 seconds (queued for 3 seconds)