.hpp to .h

continued