fix up a struct forward declaration