Put back some code lost in a merge.

This piece restores declaration of structs.