Next set of fixes for reporting issues in included source files.