Fixes some errors when specifying system C++ include directories where
the C++ headers need to #include_next related C headers.