Cite Sénizergues, soundness of + rule.
Clean up include files.