Switched back to .h from .hpp