Changed header file extensions to hpp for compatibility with emacs mode detection.
fix bad includes from hpp rename