CalculateSpillWeights cleanup: remove unneeded includes