--- a/cmd.avv.in	Thu Nov 13 02:32:01 2014 +0200
+++ b/cmd.avv.in	Thu Nov 13 02:32:29 2014 +0200
@@ -3,9 +3,13 @@
 Method:      glib
 Version:     ${PROJECT_VERSION}
 Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
-Requires:    utils:2 + ( commands:4 | commands:3 ) + ( roster:4 | roster:3 | roster:2 | roster:1 ) +
-             ( hooks:5 | hooks:4 | hooks:3 | hooks:2 | hooks:1 ) + logprint:3 + settings:1 +
-	     ( xmpp:6 | xmpp:5 | xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 )
+Requires:    ( commands:5 | commands:4 | commands:3 ) +
+             ( hooks:7 | hooks:6 | hooks:5 | hooks:4 | hooks:3 | hooks:2 | hooks:1 ) +
+	     logprint:3 +
+	     ( roster:7 | roster:6 | roster:5 | roster:4 | roster:3 | roster:2 | roster:1 ) +
+	     settings:1 +
+             ( utils:4 | utils:3 | utils:2 ) +
+	     ( xmpp:8 | xmpp:7 | xmpp:6 | xmpp:5 | xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 )
 Init:        mcmd_init
 Uninit:      mcmd_uninit
 

--- a/cmd.c	Thu Nov 13 02:32:01 2014 +0200
+++ b/cmd.c	Thu Nov 13 02:32:29 2014 +0200
@@ -25,15 +25,15 @@
 #include <errno.h>
 #include <string.h>
 
-#include <mcabber/commands.h>
-#include <mcabber/logprint.h>
-#include <mcabber/utils.h>
-#include <mcabber/settings.h>
-#include <mcabber/hbuf.h>
-#include <mcabber/xmpp.h>
-#include <mcabber/roster.h>
-#include <mcabber/modules.h>
-#include <mcabber/hooks.h>
+#include <mcabber/commands.h> // cmd_add (), cmd_del ()
+#include <mcabber/hbuf.h>     // HBB_BLOCKSIZE
+#include <mcabber/hooks.h>    // hk_message_out ()
+#include <mcabber/logprint.h> // scr_log_print ()
+#include <mcabber/modules.h>  // module_info_t
+#include <mcabber/roster.h>   // roster_find ()
+#include <mcabber/settings.h> // setting_opt_get (), settings_opt_get_int ()
+#include <mcabber/utils.h>    // to_utf8 ()
+#include <mcabber/xmpp.h>     // xmpp_is_online (), xmpp_send_msg ()
 
 #include "config.h"