How to be inclusive

I serve on the Undergraduate Student Government Diversity Committee this year, and over the last few weeks have been developing a survey about diversity on my campus. What I found interesting and challenging was trying to word the questions so as to be inclusive, especially the demographic ones. I can't create a survey that goes against the principles of the very committee that is creating it! It's funny that I serve on the Diversity Committee, and as involved as I am with the diversity and inclusive excellence movement on campus, I still don't know how to entirely be inclusive myself. Is there really any right way, and who decides the right way?