Master: Update .h -> .hpp