With Xorg 1.16 -retros is gone for good. At least as alias.
Add changes required by Saya