*8295* correctly index dependent files