CGeneration: filter out duplicate includes, cleanup