Added include guards and C++ extern "C" {} constructs. Partial fix for #607253.

Bugfix candidate.