changed *.h to *.hpp to avoid C errors
finally builds