Made headers C++ compatible