Changed included header files to C++ version.