Header and import repackaging