More fixes for removing .h appending