'.h' -> '.hpp', minor include changes