Fix filename in header and use C++ version of the C header files.