Merge pull request #814 from jussike/master

Allow including inside of extern C