Switched to using C++ header files