This report from the University of California, San Francisco Center of Excellence on Transgender HIV Prevention makes recommendations for how to collect inclusive data about gender identity and gender expression from transgender individuals. These recommendations have been endorsed by notable transgender organizations including the National Center for Transgender Equality and the Transgender Law Center.
Ignatius Bau 