Switched .h headers to .hpp