Making all struct decls compatible for now.