Merge "Fix extern "C" guards."