Get rid of CamelCase, and don't use a typedef, so we can
forward-declare it, and unclutter the include dependencies.