--- a/CMakeLists.txt	Sat Dec 26 02:00:19 2009 +0200
+++ b/CMakeLists.txt	Fri Jan 15 09:20:47 2010 +0200
@@ -29,7 +29,7 @@
 set(CPACK_PACKAGE_VERSION "0.0.1")
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber example modularized cmd implementation")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell commands output to others")
 set(CPACK_RESOURCE_FILE_LICENSE ${cmd_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
@@ -53,12 +53,12 @@
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${GMODULE_INCLUDE_DIRS} 
-                    ${LM_INCLUDE_DIRS}) 
+                    ${LM_INCLUDE_DIRS}
+                    ${MCABBER_INCLUDE_DIR})
 target_link_libraries(cmd ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}) 
 include_directories(${cmd_SOURCE_DIR} 
-                    ${cmd_BINARY_DIR} 
-                    ${MCABBER_INCLUDE_DIR}) 
+                    ${cmd_BINARY_DIR})
 
 ## Installation
 install(TARGETS cmd DESTINATION lib/mcabber) 

--- a/cmd.c	Sat Dec 26 02:00:19 2009 +0200
+++ b/cmd.c	Fri Jan 15 09:20:47 2010 +0200
@@ -25,13 +25,13 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "commands.h"
-#include "logprint.h"
-#include "utils.h"
-#include "settings.h"
-#include "hbuf.h"
-#include "xmpp.h"
-#include "roster.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>
 
 typedef struct {
 	gchar      *jid;