fix sort Idiv, and an include (for export)