rename to cpp
build fix
rename to hpp
because we're in c++ we can use the typenames directly and minor warning fixes