Take into account files which include another file that then dies.

Change-Id: Ic95dbdb7377d5f5fa980bb804f1141316b173fbf