--- a/avatar.c	Mon Feb 22 23:25:24 2010 +0200
+++ b/avatar.c	Thu Mar 04 19:50:02 2010 +0200
@@ -22,7 +22,6 @@
 #define PNG_USER_MEM_SUPPORTED
 
 #include <glib.h>
-#include <gmodule.h>
 #include <loudmouth/loudmouth.h>
 #include <aalib.h>
 #include <png.h>
@@ -42,11 +41,27 @@
 #include <mcabber/hbuf.h>
 #include <mcabber/hooks.h>
 #include <mcabber/settings.h>
+#include <mcabber/modules.h>
 
 #include <mcabber/pep.h>
 
 #include "config.h"
 
+// module description
+
+static void avatar_init   (void);
+static void avatar_uninit (void);
+
+static const gchar *deps[] = { "pep", NULL };
+module_info_t info_avatar = {
+	.mcabber_version = "0.10.0",
+	.requires        = deps,
+	.init            = avatar_init,
+	.uninit          = avatar_uninit,
+};
+
+// globals
+
 #define NS_AVATAR_DATA            ( "urn:xmpp:avatar:data"            )
 #define NS_AVATAR_METADATA        ( "urn:xmpp:avatar:metadata"        )
 #define NS_AVATAR_METADATA_NOTIFY ( "urn:xmpp:avatar:metadata+notify" )
@@ -1126,7 +1141,7 @@
 	}
 }
 
-const gchar *g_module_check_init (GModule *module)
+static void avatar_init (void)
 {
 	pep_register_xmlns_handler (NS_AVATAR_METADATA, avatar_handler, NULL, NULL);
 	avatar_metadata_reply_handler = lm_message_handler_new (avatar_publish_metadata_reply_handler, NULL, NULL);
@@ -1137,11 +1152,9 @@
 
 	xmpp_add_feature (NS_AVATAR_METADATA);
 	xmpp_add_feature (NS_AVATAR_METADATA_NOTIFY);
-
-	return NULL;
 }
 
-void g_module_unload (GModule *module)
+static void avatar_uninit (void)
 {
 	xmpp_del_feature (NS_AVATAR_METADATA);
 	xmpp_del_feature (NS_AVATAR_METADATA_NOTIFY);