Fixed .hpp stuff again