remove forward declaration of DiffItem