Fixed missing/circular imports in nib2cib