Changed C headers to C++ headers, .h->.hpp
Changed C headers to C++ headers, .h->.hpp