Added support for C++ in library header