Fix #631 : D8 include files might have .php in future