Added detection of .h++