Replace C includes with C++ includes