Renamed .h files to .hpp files and fixed include statement in relevant cpp files