--- a/marking.c	Tue May 03 02:30:10 2011 +0300
+++ b/marking.c	Tue May 03 16:35:05 2011 +0300
@@ -30,17 +30,18 @@
 #include <mcabber/utils.h>
 #include <mcabber/logprint.h>
 #include <mcabber/modules.h>
+#include <mcabber/api.h>
 
 #include "config.h"
 
-static void marking_init   (void);
-static void marking_uninit (void);
+void marking_init   (void);
+void marking_uninit (void);
 
 #define DESCRIPTION ( "Actions on multiple marked buddies\nProvides commands /mark and /marked" )
 
-static module_info_t info_marking_experimental = {
-	.branch      = "experimental",
-	.api         = 27,
+static module_info_t info_marking_dev = {
+	.branch      = "dev",
+	.api         = 20,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
 	.requires    = NULL,
@@ -49,19 +50,8 @@
 	.next        = NULL,
 };
 
-static module_info_t info_marking_dev = {
-	.branch      = "dev",
-	.api         = 13,
-	.version     = PROJECT_VERSION,
-	.description = DESCRIPTION,
-	.requires    = NULL,
-	.init        = marking_init,
-	.uninit      = marking_uninit,
-	.next        = &info_marking_experimental,
-};
-
 module_info_t info_marking = {
-	.branch      = "0.10.0",
+	.branch      = "0.10.1",
 	.api         = 1,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
@@ -71,7 +61,7 @@
 	.next        = &info_marking_dev,
 };
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer mark_cmid   = NULL;
 static gpointer marked_cmid = NULL;
 #endif
@@ -215,9 +205,9 @@
 	free_arg_lst (args);
 }
 
-static void marking_init (void)
+void marking_init (void)
 {
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("mark", "", 0, COMPL_JID, do_mark, NULL);
 	cmd_add ("marked", "", 0, COMPL_CMD, do_marked, NULL);
 #else
@@ -226,9 +216,9 @@
 #endif
 }
 
-static void marking_uninit (void)
+void marking_uninit (void)
 {
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("mark");
 	cmd_del ("marked");
 #else