Without these fixes, configuring the GCC build to enable C++ support would result in a build failure.