Merge "Add missing extern "C"."