--- a/disco.c	Tue May 03 02:30:09 2011 +0300
+++ b/disco.c	Tue May 03 14:32:30 2011 +0300
@@ -42,22 +42,11 @@
 // module description
 //
 
-static void disco_init   (void);
-static void disco_uninit (void);
+void disco_init   (void);
+void disco_uninit (void);
 
 #define DESCRIPTION ( "Service discovery requests\nProvides command /disco" )
 
-static module_info_t info_disco_experimental = {
-	.branch      = "experimental",
-	.api         = 27,
-	.version     = PROJECT_VERSION,
-	.description = DESCRIPTION,
-	.requires    = NULL,
-	.init        = disco_init,
-	.uninit      = disco_uninit,
-	.next        = NULL,
-};
-
 static module_info_t info_disco_dev = {
 	.branch      = "dev",
 	.api         = 13,
@@ -66,7 +55,7 @@
 	.requires    = NULL,
 	.init        = disco_init,
 	.uninit      = disco_uninit,
-	.next        = &info_disco_experimental,
+	.next        = NULL,
 };
 
 module_info_t info_disco = {
@@ -108,7 +97,7 @@
 // globals
 //
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer disco_cmid = NULL;
 #endif
 
@@ -648,7 +637,7 @@
 	return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 
-static void disco_init (void)
+void disco_init (void)
 {
 	// completion
 	disco_cid = compl_new_category ();
@@ -661,7 +650,7 @@
 	disco_hid = hk_add_handler (disco_hh, HOOK_PRE_DISCONNECT, G_PRIORITY_DEFAULT, NULL);
 
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
 #else
 	disco_cmid = cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
@@ -670,10 +659,10 @@
 	return;
 }
 
-static void disco_uninit (void)
+void disco_uninit (void)
 {
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("disco");
 #else
 	if (disco_cmid)