Actually, that's it. 

There was one more commit, but it should no longer be necessary, because I see you wrapped the headers concerned in conditional extern "C" already. Which is most probably preferable to wrapping the #includes...