--- a/cmd.c	Mon Feb 15 19:34:14 2010 +0200
+++ b/cmd.c	Thu Mar 04 19:50:39 2010 +0200
@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <gmodule.h>
 #include <unistd.h>
 #include <errno.h>
 
@@ -32,6 +31,17 @@
 #include <mcabber/hbuf.h>
 #include <mcabber/xmpp.h>
 #include <mcabber/roster.h>
+#include <mcabber/modules.h>
+
+static void mcmd_init   (void);
+static void mcmd_uninit (void);
+
+module_info_t info_cmd = {
+	.mcabber_version = "0.10.0",
+	.requires        = NULL,
+	.init            = mcmd_init,
+	.uninit          = mcmd_uninit,
+};
 
 typedef struct {
 	gchar      *jid;
@@ -299,14 +309,12 @@
 	}
 }
 
-const gchar *g_module_check_init(GModule *module)
+static void mcmd_init (void)
 {
 	cmd_add ("cmd", "", 0, 0, do_cmd, NULL);
-
-	return NULL;
 }
 
-void g_module_unload(GModule *module)
+static void mcmd_uninit (void)
 {
 	GSList *sel;