This talk was given at the Education Summit at the 2015 Game Developers Conference. In it, Jane Pinckard and I advocate for treating issues of diversity and inclusion throughout a game curriculum, rather than in a single dedicated course. We offer strategies that have worked in our own courses for introducing and discussing these complex issues.