Prepare to export macros from state Sort

---

ok