fix declaration of structs