Extends the libhybris compilation fix to the C++ compiler