added goto-error within included files