Stop double loading files uncluded in packages Ref T6