diff -r 6de25ac5876c -r 32bebcf6bbbd env.c
--- a/env.c	Thu Nov 13 20:17:46 2014 +0200
+++ b/env.c	Thu Nov 13 20:18:21 2014 +0200
@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <mcabber/commands.h>
-#include <mcabber/compl.h>
-#include <mcabber/logprint.h>
-#include <mcabber/modules.h>
+#include <mcabber/commands.h>  // cmd_add (), cmd_del (), cmd_set_safe ()
+#include <mcabber/compl.h>     // COMPL_FILENAME
+#include <mcabber/logprint.h>  // scr_log_print ()
+#include <mcabber/modules.h>   // module_info_t
 
 #include "config.h"
 
@@ -48,7 +48,7 @@
 	.next        = NULL,
 };
 
-#ifdef MCABBER_API_HAVE_CMD_ID
+#ifdef HAVE_MCABBER_CMD_ID
 static gpointer env_env_cmid = NULL;
 static gpointer env_cd_cmid  = NULL;
 static gboolean env_env_set_safe = FALSE;
@@ -158,7 +158,7 @@
 void env_load (void)
 {
 	// command
-#ifndef MCABBER_API_HAVE_CMD_ID
+#ifndef HAVE_MCABBER_CMD_ID
 	cmd_add ("env", "", 0, 0, do_env, NULL);
 	cmd_add ("cd", "", COMPL_FILENAME, 0, do_cd, NULL);
 #else
@@ -172,7 +172,7 @@
 void env_unload (void)
 {
 	// command
-#ifndef MCABBER_API_HAVE_CMD_ID
+#ifndef HAVE_MCABBER_CMD_ID
 	cmd_del ("cd");
 	cmd_del ("env");
 #else