Fold errors from included files into the include error [#367]