Take account of the include file moves in MoleQueue

Change-Id: I4a6b0945b151bd7fcbd4f6f7916e4fb1b9eb8379