diff -Naur jabberd-2.1.19-bak/c2s/bind.c jabberd-2.1.19/c2s/bind.c
--- jabberd-2.1.19-bak/c2s/bind.c	2007-10-31 04:54:42.000000000 -0400
+++ jabberd-2.1.19/c2s/bind.c	2007-11-29 19:58:56.000000000 -0500
@@ -40,7 +40,7 @@
         ns = nad_add_namespace(nad, uri_IQAUTH, NULL);
         nad_append_elem(nad, ns, "auth", 1);
     
-        c2s = (c2s_t) p->private;
+        c2s = (c2s_t) p->privateData;
         host = xhash_get(c2s->hosts, s->req_to);
         if(! host) host = c2s->vhost;
         if(host && host->ar_register_enable) {
@@ -72,7 +72,7 @@
     c2s = va_arg(args, c2s_t);
 
     p->features = _bind_features;
-    p->private = (void *) c2s;
+    p->privateData = (void *) c2s;
 
     return 0;
 }
diff -Naur jabberd-2.1.19-bak/sm/mod_amp.c jabberd-2.1.19/sm/mod_amp.c
--- jabberd-2.1.19-bak/sm/mod_amp.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_amp.c	2007-11-29 20:00:38.000000000 -0500
@@ -116,7 +116,7 @@
 }
 
 static mod_ret_t _amp_pkt_user(mod_instance_t mi, user_t user, pkt_t pkt) {
-    mod_amp_config_t config = (mod_amp_config_t) mi->mod->private;
+    mod_amp_config_t config = (mod_amp_config_t) mi->mod->privateData;
     int ns, elem, attr;
     amp_rule_t rule, rule_c;
 	int errormode = 0;
@@ -313,7 +313,7 @@
 }
 
 static mod_ret_t _amp_pkt_sm(mod_instance_t mi, pkt_t pkt) {
-    mod_amp_config_t config = (mod_amp_config_t) mi->mod->private;
+    mod_amp_config_t config = (mod_amp_config_t) mi->mod->privateData;
     pkt_t res;
     int ns, attr;
     
@@ -373,7 +373,7 @@
 }
 
 static void _amp_free(module_t mod) {
-    free(mod->private);
+    free(mod->privateData);
 }
 
 DLLEXPORT int module_init(mod_instance_t mi, char *arg) {
@@ -433,7 +433,7 @@
         config->offlinestorageDisabled = 1;
     }
     
-    mod->private = config;    
+    mod->privateData = config;    
 
     mod->in_sess = _amp_in_sess;
     mod->pkt_user = _amp_pkt_user;
diff -Naur jabberd-2.1.19-bak/sm/mod_announce.c jabberd-2.1.19/sm/mod_announce.c
--- jabberd-2.1.19-bak/sm/mod_announce.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_announce.c	2007-11-29 20:00:14.000000000 -0500
@@ -116,7 +116,7 @@
 
 static mod_ret_t _announce_in_sess(mod_instance_t mi, sess_t sess, pkt_t pkt) {
     module_t mod = mi->mod;
-    moddata_t data = (moddata_t) mod->private;
+    moddata_t data = (moddata_t) mod->privateData;
     time_t t;
     nad_t nad;
     pkt_t motd;
@@ -194,7 +194,7 @@
 
 static mod_ret_t _announce_pkt_sm(mod_instance_t mi, pkt_t pkt) {
     module_t mod = mi->mod;
-    moddata_t data = (moddata_t) mod->private;
+    moddata_t data = (moddata_t) mod->privateData;
     pkt_t store;
     nad_t nad;
     time_t t;
@@ -288,7 +288,7 @@
 }
 
 static void _announce_free(module_t mod) {
-    moddata_t data = (moddata_t) mod->private;
+    moddata_t data = (moddata_t) mod->privateData;
 
     if(data->nad != NULL) nad_free(data->nad);
     if(data->tos != NULL) os_free(data->tos);
@@ -304,7 +304,7 @@
     data = (moddata_t) malloc(sizeof(struct moddata_st));
     memset(data, 0, sizeof(struct moddata_st));
 
-    mod->private = (void *) data;
+    mod->privateData = (void *) data;
 
     data->index = mod->index;
 
diff -Naur jabberd-2.1.19-bak/sm/mod_disco.c jabberd-2.1.19/sm/mod_disco.c
--- jabberd-2.1.19-bak/sm/mod_disco.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_disco.c	2007-11-29 20:02:09.000000000 -0500
@@ -298,7 +298,7 @@
 static mod_ret_t _disco_pkt_sm_populate(mod_instance_t mi, pkt_t pkt)
 {
     module_t mod = mi->mod;
-    disco_t d = (disco_t) mod->private;
+    disco_t d = (disco_t) mod->privateData;
     int ns, qelem, elem, attr;
     service_t svc;
 
@@ -410,7 +410,7 @@
 /** catch responses and populate the table; respond to requests */
 static mod_ret_t _disco_pkt_sm(mod_instance_t mi, pkt_t pkt) {
     module_t mod = mi->mod;
-    disco_t d = (disco_t) mod->private;
+    disco_t d = (disco_t) mod->privateData;
     pkt_t result;
     int node;
     
@@ -516,7 +516,7 @@
 /** legacy support for agents requests from sessions */
 static mod_ret_t _disco_in_sess(mod_instance_t mi, sess_t sess, pkt_t pkt) {
     module_t mod = mi->mod;
-    disco_t d = (disco_t) mod->private;
+    disco_t d = (disco_t) mod->privateData;
     pkt_t result;
 
     /* we want agents gets */
@@ -546,7 +546,7 @@
 static mod_ret_t _disco_pkt_router(mod_instance_t mi, pkt_t pkt)
 {
     module_t mod = mi->mod;
-    disco_t d = (disco_t) mod->private;
+    disco_t d = (disco_t) mod->privateData;
     service_t svc;
     pkt_t request;
     int ns;
@@ -606,7 +606,7 @@
 }
 
 static void _disco_free(module_t mod) {
-    disco_t d = (disco_t) mod->private;
+    disco_t d = (disco_t) mod->privateData;
 
     xhash_walk(d->stat, _disco_free_walker, NULL);
     xhash_walk(d->dyn, _disco_free_walker, NULL);
@@ -663,7 +663,7 @@
         log_debug(ZONE, "browse compat enabled");
     
     /* our data */
-    mod->private = (void *) d;
+    mod->privateData = (void *) d;
     
     /* our handlers */
     mod->pkt_sm = _disco_pkt_sm;
diff -Naur jabberd-2.1.19-bak/sm/mod_iq_last.c jabberd-2.1.19/sm/mod_iq_last.c
--- jabberd-2.1.19-bak/sm/mod_iq_last.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_iq_last.c	2007-11-29 20:02:23.000000000 -0500
@@ -38,7 +38,7 @@
     if(pkt->type != pkt_IQ || pkt->ns != ns_LAST)
         return mod_PASS;
 
-    snprintf(uptime, 10, "%d", (int) (time(NULL) - (time_t) mod->private));
+    snprintf(uptime, 10, "%d", (int) (time(NULL) - (time_t) mod->privateData));
     nad_set_attr(pkt->nad, 2, -1, "seconds", uptime, 0);
 
     /* tell them */
@@ -157,7 +157,7 @@
     mod->free = _iq_last_free;
 
     /* startup time */
-    mod->private = (void *) time(NULL);
+    mod->privateData = (void *) time(NULL);
 
     ns_LAST = sm_register_ns(mod->mm->sm, uri_LAST);
     feature_register(mod->mm->sm, uri_LAST);
diff -Naur jabberd-2.1.19-bak/sm/mod_offline.c jabberd-2.1.19/sm/mod_offline.c
--- jabberd-2.1.19-bak/sm/mod_offline.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_offline.c	2007-11-29 20:02:42.000000000 -0500
@@ -101,7 +101,7 @@
 }
 
 static mod_ret_t _offline_pkt_user(mod_instance_t mi, user_t user, pkt_t pkt) {
-    mod_offline_t offline = (mod_offline_t) mi->mod->private;
+    mod_offline_t offline = (mod_offline_t) mi->mod->privateData;
     int ns, elem, attr;
     os_t os;
     os_object_t o;
@@ -273,7 +273,7 @@
 }
 
 static void _offline_free(module_t mod) {
-    mod_offline_t offline = (mod_offline_t) mod->private;
+    mod_offline_t offline = (mod_offline_t) mod->privateData;
 
     free(offline);
 }
@@ -302,7 +302,7 @@
 
     offline->userquota = j_atoi(config_get_one(mod->mm->sm->config, "offline.userquota", 0), 0);
 
-    mod->private = offline;
+    mod->privateData = offline;
 
     mod->in_sess = _offline_in_sess;
     mod->pkt_user = _offline_pkt_user;
diff -Naur jabberd-2.1.19-bak/sm/mod_roster.c jabberd-2.1.19/sm/mod_roster.c
--- jabberd-2.1.19-bak/sm/mod_roster.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_roster.c	2007-11-29 20:03:07.000000000 -0500
@@ -168,7 +168,7 @@
 
 static mod_ret_t _roster_in_sess_s10n(mod_instance_t mi, sess_t sess, pkt_t pkt)
 {
-    mod_roster_t mroster = (mod_roster_t) mi->mod->private;
+    mod_roster_t mroster = (mod_roster_t) mi->mod->privateData;
     module_t mod = mi->mod;
     item_t item;
     pkt_t push;
@@ -273,7 +273,7 @@
 
 static void _roster_set_item(pkt_t pkt, int elem, sess_t sess, mod_instance_t mi)
 {
-    mod_roster_t mroster = (mod_roster_t) mi->mod->private;
+    mod_roster_t mroster = (mod_roster_t) mi->mod->privateData;
     module_t mod = mi->mod;
     int attr, ns, i, ret, items = -1;
     jid_t jid;
@@ -759,7 +759,7 @@
 
     mroster->maxitems = j_atoi(config_get_one(mod->mm->sm->config, "roster.maxitems", 0), 0);
 
-    mod->private = mroster;
+    mod->privateData = mroster;
 
     mod->in_sess = _roster_in_sess;
     mod->pkt_user = _roster_pkt_user;
diff -Naur jabberd-2.1.19-bak/sm/mod_status.c jabberd-2.1.19/sm/mod_status.c
--- jabberd-2.1.19-bak/sm/mod_status.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_status.c	2007-11-29 20:03:21.000000000 -0500
@@ -192,7 +192,7 @@
 static mod_ret_t _status_pkt_sm(mod_instance_t mi, pkt_t pkt) {
     time_t t;
     module_t mod = mi->mod;
-    status_t st = (status_t) mod->private;
+    status_t st = (status_t) mod->privateData;
 
     /* only check presence/subs to configured resource */
     if(!(pkt->type & pkt_PRESENCE || pkt->type & pkt_S10N) || st->resource == NULL || strcmp(pkt->to->resource, st->resource) != 0)
@@ -269,7 +269,7 @@
     tr->sm = mod->mm->sm;
     tr->resource = config_get_one(mod->mm->sm->config, "status.resource", 0);
 
-    mod->private = tr;
+    mod->privateData = tr;
 
     mod->user_delete = _status_user_delete;
     mod->sess_start = _status_sess_start;
diff -Naur jabberd-2.1.19-bak/sm/mod_template_roster.c jabberd-2.1.19/sm/mod_template_roster.c
--- jabberd-2.1.19-bak/sm/mod_template_roster.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/mod_template_roster.c	2007-11-29 20:01:21.000000000 -0500
@@ -214,7 +214,7 @@
 }
 
 static int _template_roster_user_create(mod_instance_t mi, jid_t jid) {
-    template_roster_t tr = (template_roster_t) mi->mod->private;
+    template_roster_t tr = (template_roster_t) mi->mod->privateData;
     item_t item;
     union xhashv xhv;
 
@@ -235,7 +235,7 @@
 }
 
 static void _template_roster_free(module_t mod) {
-    template_roster_t tr = (template_roster_t) mod->private;
+    template_roster_t tr = (template_roster_t) mod->privateData;
 
     if(tr->items != NULL)
         xhash_free(tr->items);
@@ -260,7 +260,7 @@
     tr->sm = mod->mm->sm;
     tr->filename = filename;
 
-    mod->private = tr;
+    mod->privateData = tr;
 
     mod->user_create = _template_roster_user_create;
     mod->free = _template_roster_free;
diff -Naur jabberd-2.1.19-bak/sm/sm.h jabberd-2.1.19/sm/sm.h
--- jabberd-2.1.19-bak/sm/sm.h	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/sm.h	2007-11-29 19:54:55.000000000 -0500
@@ -397,7 +397,7 @@
 
     int                 init;       /**< number of times the module intialiser has been called */
 
-    void                *private;   /**< module private data */
+    void                *privateData;   /**< module private data */
 
     int                 (*sess_start)(mod_instance_t mi, sess_t sess);              /**< sess-start handler */
     void                (*sess_end)(mod_instance_t mi, sess_t sess);                /**< sess-end handler */
@@ -596,7 +596,7 @@
 
     char        *name;          /**< name of driver */
 
-    void        *private;       /**< driver private data */
+    void        *privateData;       /**< driver private data */
 
     /** called to find out if this driver can handle a particular type */
     st_ret_t    (*add_type)(st_driver_t drv, const char *type);
@@ -608,7 +608,7 @@
     /** count handler */
     st_ret_t    (*count)(st_driver_t drv, const char *type, const char *owner, const char *filter, int *count);
     /** delete handler */
-    st_ret_t    (*delete)(st_driver_t drv, const char *type, const char *owner, const char *filter);
+    st_ret_t    (*deleteData)(st_driver_t drv, const char *type, const char *owner, const char *filter);
     /** replace handler */
     st_ret_t    (*replace)(st_driver_t drv, const char *type, const char *owner, const char *filter, os_t os);
 
diff -Naur jabberd-2.1.19-bak/sm/storage.c jabberd-2.1.19/sm/storage.c
--- jabberd-2.1.19-bak/sm/storage.c	2007-10-31 04:54:41.000000000 -0400
+++ jabberd-2.1.19/sm/storage.c	2007-11-29 20:00:55.000000000 -0500
@@ -292,7 +292,7 @@
             return ret;
     }
 
-    return (drv->delete)(drv, type, owner, filter);
+    return (drv->deleteData)(drv, type, owner, filter);
 }
 
 st_ret_t storage_replace(storage_t st, const char *type, const char *owner, const char *filter, os_t os) {
diff -Naur jabberd-2.1.19-bak/storage/storage_mysql.c jabberd-2.1.19/storage/storage_mysql.c
--- jabberd-2.1.19-bak/storage/storage_mysql.c	2007-10-31 04:54:44.000000000 -0400
+++ jabberd-2.1.19/storage/storage_mysql.c	2007-12-17 17:11:29.000000000 -0500
@@ -71,7 +71,7 @@
 #define MYSQL_SAFE(blocks, size, len) if((size) >= len) len = _st_mysql_realloc(&(blocks),(size + 1));
 
 static void _st_mysql_convert_filter_recursive(st_driver_t drv, st_filter_t f, char **buf, int *buflen, int *nbuf) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     st_filter_t scan; 
     char *cval;
     int vlen;
@@ -139,7 +139,7 @@
 }
 
 static char *_st_mysql_convert_filter(st_driver_t drv, const char *owner, const char *filter) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     char *buf = NULL, *sbuf = NULL, *cfilter;
     int buflen = 0, nbuf = 0, fbuf;
     st_filter_t f;
@@ -180,7 +180,7 @@
 }
 
 static st_ret_t _st_mysql_put_guts(st_driver_t drv, const char *type, const char *owner, os_t os) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     char *left = NULL, *right = NULL;
     int lleft = 0, lright = 0, nleft, nright;
     os_object_t o;
@@ -273,7 +273,7 @@
 }
 
 static st_ret_t _st_mysql_put(st_driver_t drv, const char *type, const char *owner, os_t os) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
 
     if(os_count(os) == 0)
         return st_SUCCESS;
@@ -312,7 +312,7 @@
 }
 
 static st_ret_t _st_mysql_get(st_driver_t drv, const char *type, const char *owner, const char *filter, os_t *os) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     char *cond, *buf = NULL;
     int buflen = 0;
     MYSQL_RES *res;
@@ -442,7 +442,7 @@
 }
 
 static st_ret_t _st_mysql_count(st_driver_t drv, const char *type, const char *owner, const char *filter, int *count) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     char *cond, *buf = NULL;
     int buflen = 0;
     MYSQL_RES *res;
@@ -510,7 +510,7 @@
 }
 
 static st_ret_t _st_mysql_delete(st_driver_t drv, const char *type, const char *owner, const char *filter) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
     char *cond, *buf = NULL;
     int buflen = 0;
     char tbuf[128];
@@ -545,7 +545,7 @@
 }
 
 static st_ret_t _st_mysql_replace(st_driver_t drv, const char *type, const char *owner, const char *filter, os_t os) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
 
     if(mysql_ping(data->conn) != 0) {
         log_write(drv->st->sm->log, LOG_ERR, "mysql: connection to database lost");
@@ -587,7 +587,7 @@
 }
 
 static void _st_mysql_free(st_driver_t drv) {
-    drvdata_t data = (drvdata_t) drv->private;
+    drvdata_t data = (drvdata_t) drv->privateData;
 
     mysql_close(data->conn);
 
@@ -649,13 +649,13 @@
 
     data->prefix = config_get_one(drv->st->sm->config, "storage.mysql.prefix", 0);
 
-    drv->private = (void *) data;
+    drv->privateData = (void *) data;
 
     drv->add_type = _st_mysql_add_type;
     drv->put = _st_mysql_put;
     drv->count = _st_mysql_count;
     drv->get = _st_mysql_get;
-    drv->delete = _st_mysql_delete;
+    drv->deleteData = _st_mysql_delete;
     drv->replace = _st_mysql_replace;
     drv->free = _st_mysql_free;
 
diff -Naur jabberd-2.1.19-bak/sx/sasl_gsasl.c jabberd-2.1.19/sx/sasl_gsasl.c
--- jabberd-2.1.19-bak/sx/sasl_gsasl.c	2007-10-31 04:54:42.000000000 -0400
+++ jabberd-2.1.19/sx/sasl_gsasl.c	2007-11-29 19:57:28.000000000 -0500
@@ -210,7 +210,7 @@
 }
 
 static void _sx_sasl_features(sx_t s, sx_plugin_t p, nad_t nad) {
-    _sx_sasl_t ctx = (_sx_sasl_t) p->private;
+    _sx_sasl_t ctx = (_sx_sasl_t) p->privateData;
     Gsasl_session *sd = (Gsasl_session *) s->plugin_data[p->index];
     int ns, nmechs, ret;
     char *mechs, *mech, *c;
@@ -282,7 +282,7 @@
 
 /** process handshake packets from the client */
 static void _sx_sasl_client_process(sx_t s, sx_plugin_t p, Gsasl_session *sd, char *mech, char *in, int inlen) {
-    _sx_sasl_t ctx = (_sx_sasl_t) p->private;
+    _sx_sasl_t ctx = (_sx_sasl_t) p->privateData;
     char *buf = NULL, *out = NULL, *realm = NULL, *ext_id;
     char hostname[256];
     int buflen, outlen, ret, i;
@@ -671,7 +671,7 @@
 }
 
 static void _sx_sasl_unload(sx_plugin_t p) {
-    _sx_sasl_t ctx = (_sx_sasl_t) p->private;
+    _sx_sasl_t ctx = (_sx_sasl_t) p->privateData;
 
     if (ctx->gsasl_ctx != NULL) gsasl_done (ctx->gsasl_ctx);
     if (ctx->appname != NULL) free(ctx->appname);
@@ -717,7 +717,7 @@
 
     _sx_debug(ZONE, "sasl context initialised");
 
-    p->private = (void *) ctx;
+    p->privateData = (void *) ctx;
 
     p->unload = _sx_sasl_unload;
 
@@ -732,7 +732,7 @@
 
 /** kick off the auth handshake */
 int sx_sasl_auth(sx_plugin_t p, sx_t s, char *appname, char *mech, char *user, char *pass) {
-    _sx_sasl_t ctx = (_sx_sasl_t) p->private;
+    _sx_sasl_t ctx = (_sx_sasl_t) p->privateData;
     Gsasl_session *sd;
     char *buf, *out;
     char hostname[256];
diff -Naur jabberd-2.1.19-bak/sx/ssl.c jabberd-2.1.19/sx/ssl.c
--- jabberd-2.1.19-bak/sx/ssl.c	2007-10-31 04:54:42.000000000 -0400
+++ jabberd-2.1.19/sx/ssl.c	2007-11-29 19:58:24.000000000 -0500
@@ -500,7 +500,7 @@
     sc->wbio = BIO_new(BIO_s_mem());
 
     /* new ssl conn */
-    sc->ssl = SSL_new((SSL_CTX *) p->private);
+    sc->ssl = SSL_new((SSL_CTX *) p->privateData);
     SSL_set_bio(sc->ssl, sc->rbio, sc->wbio);
     SSL_set_connect_state(sc->ssl);
 
@@ -579,7 +579,7 @@
     sc->wbio = BIO_new(BIO_s_mem());
 
     /* new ssl conn */
-    sc->ssl = SSL_new((SSL_CTX *) p->private);
+    sc->ssl = SSL_new((SSL_CTX *) p->privateData);
     SSL_set_bio(sc->ssl, sc->rbio, sc->wbio);
     SSL_set_accept_state(sc->ssl);
 
@@ -628,7 +628,7 @@
 }
 
 static void _sx_ssl_unload(sx_plugin_t p) {
-    SSL_CTX_free((SSL_CTX *) p->private);
+    SSL_CTX_free((SSL_CTX *) p->privateData);
 }
 
 int sx_openssl_initialized = 0;
@@ -646,7 +646,7 @@
     if(pemfile == NULL)
         return 1;
 
-    if(p->private != NULL)
+    if(p->privateData != NULL)
         return 1;
 
     cachain = va_arg(args, char *);
@@ -707,7 +707,7 @@
 
     p->magic = SX_SSL_MAGIC;
 
-    p->private = (void *) ctx;
+    p->privateData = (void *) ctx;
 
     p->unload = _sx_ssl_unload;
 
diff -Naur jabberd-2.1.19-bak/sx/sx.c jabberd-2.1.19/sx/sx.c
--- jabberd-2.1.19-bak/sx/sx.c	2007-10-31 04:54:42.000000000 -0400
+++ jabberd-2.1.19/sx/sx.c	2007-11-29 19:56:48.000000000 -0500
@@ -48,8 +48,8 @@
         memset(s->plugin_data, 0, sizeof(void *) * env->nplugins);
 
         for(i = 0; i < env->nplugins; i++)
-            if(env->plugins[i]->new != NULL)
-                (env->plugins[i]->new)(s, env->plugins[i]);
+            if(env->plugins[i]->new_sx != NULL)
+                (env->plugins[i]->new_sx)(s, env->plugins[i]);
     }
 
     _sx_debug(ZONE, "allocated new sx for %d", tag);
diff -Naur jabberd-2.1.19-bak/sx/sx.h jabberd-2.1.19/sx/sx.h
--- jabberd-2.1.19-bak/sx/sx.h	2007-10-31 04:54:42.000000000 -0400
+++ jabberd-2.1.19/sx/sx.h	2007-11-29 19:53:57.000000000 -0500
@@ -326,9 +326,9 @@
 
     int                     index;
 
-    void                    *private;
+    void                    *privateData;
 
-    void                    (*new)(sx_t s, sx_plugin_t p);                          /* pre-run init */
+    void                    (*new_sx)(sx_t s, sx_plugin_t p);                          /* pre-run init */
     void                    (*free)(sx_t s, sx_plugin_t p);                         /* conn being freed */
 
     void                    (*client)(sx_t s, sx_plugin_t p);                       /* client init */