--- a/marking.c	Thu Nov 13 22:39:40 2014 +0200
+++ b/marking.c	Thu Nov 13 23:29:42 2014 +0200
@@ -23,13 +23,14 @@
 #include <glib.h>
 #include <string.h>
 
-#include <mcabber/hbuf.h>
-#include <mcabber/screen.h>
-#include <mcabber/commands.h>
-#include <mcabber/compl.h>
-#include <mcabber/utils.h>
-#include <mcabber/logprint.h>
-#include <mcabber/modules.h>
+#include <mcabber/commands.h>  // cmd_add (), cmd_del (), process_command ()
+#include <mcabber/compl.h>     // COMPL_JID, COMPL_CMD
+#include <mcabber/hbuf.h>      // HBB_PREFIX_INFO, HBB_PREFIX_NOFLAG
+#include <mcabber/logprint.h>  // scr_log_print ()
+#include <mcabber/modules.h>   // module_info_t
+#include <mcabber/roster.h>    // ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, SPECIAL_BUFFER_STATUS_ID, current_buddy
+#include <mcabber/screen.h>    // scr_write_incoming_message (), scr_getlogwinheight (), scr_setmsgflag_if_needed (), scr_setattentionflag_if_needed ()
+#include <mcabber/utils.h>     // free_arg_lst (), split_arg ()
 
 #include "config.h"
 
@@ -50,7 +51,7 @@
 	.next        = NULL,
 };
 
-#ifdef MCABBER_API_HAVE_CMD_ID
+#ifdef HAVE_MCABBER_CMD_ID
 static gpointer mark_cmid   = NULL;
 static gpointer marked_cmid = NULL;
 #endif
@@ -253,7 +254,7 @@
 
 void marking_init (void)
 {
-#ifndef MCABBER_API_HAVE_CMD_ID
+#ifndef HAVE_MCABBER_CMD_ID
 	cmd_add ("mark",   "", 0, COMPL_JID, do_mark,   NULL);
 	cmd_add ("marked", "", 0, COMPL_CMD, do_marked, NULL);
 #else
@@ -264,7 +265,7 @@
 
 void marking_uninit (void)
 {
-#ifndef MCABBER_API_HAVE_CMD_ID
+#ifndef HAVE_MCABBER_CMD_ID
 	cmd_del ("mark");
 	cmd_del ("marked");
 #else