Remove forward declaration of an enum