There are two solutions:
1. Inclusive restrooms. This takes time for new signage, better doors, etc., so start any time you have a choice in that. (Not usually the call of someone reading this, but you never know.)
2. Let people know the plumbing situation when you say "inclusive." That's easy.
Okay, I'm saying it: if something is hostile to nonbinary people, it can't be considered "trans inclusive." If you exclude nonbinary people, you are excluding a lot of trans people. It's great that you let trans women into women's spaces and trans men into men's spaces, but that's not enough.
