I've altered the generated C so that headers include the Olly-recommended ifdefs: > #ifdef __cplusplus > extern "C" { > #endif > . . . . > #ifdef __cplusplus > } > #endif It would be nice, Olly, if you could check that this is okay. Should there be similar ifdefs surrounding the externs defined in q/header.h ?