Fix mistakes with .h -> .hpp commit