Including files renamed (h changed to hpp)