Fixed file dependencies from switching .h to hpp