Fixed the '.h' includes to '.hpp'. Fixed 'make clean', it is now removing the correct files.