icc 13.1 doesn't like C++ code included in C files

But it does like the non-intel workaround just fine, so let's just use
that regardless.