Changed to C++ style header