C include paths once more

Merged Bitbucket Importer requested to merge bitbucket/merged-pr-199 into branch/default

Created originally on Bitbucket by oberstet (Tobias Oberstein)

Was already merged in Bitbucket before import, marked as merged by the import user

Merge request reports