--- a/CMakeLists.txt	Sat Jan 02 12:45:37 2010 +0200
+++ b/CMakeLists.txt	Thu Jan 14 13:35:14 2010 +0200
@@ -53,13 +53,13 @@
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${GMODULE_INCLUDE_DIRS} 
-                    ${LM_INCLUDE_DIRS}) 
+                    ${LM_INCLUDE_DIRS}
+					${MCABBER_INCLUDE_DIR}) 
 target_link_libraries(disco ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}
 					  ${LM_LIBRARIES})
 include_directories(${disco_SOURCE_DIR} 
-                    ${disco_BINARY_DIR} 
-                    ${MCABBER_INCLUDE_DIR}) 
+                    ${disco_BINARY_DIR}) 
 
 ## Installation
 install(TARGETS disco DESTINATION lib/mcabber) 

--- a/config.h	Sat Jan 02 12:45:37 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-
-#ifndef LOCAL_CONFIG_H
-#define LOCAL_CONFIG_H
-
-#define MODULES_ENABLE 1
-
-# endif
-

--- a/disco.c	Sat Jan 02 12:45:37 2010 +0200
+++ b/disco.c	Thu Jan 14 13:35:14 2010 +0200
@@ -23,15 +23,15 @@
 #include <loudmouth/loudmouth.h>
 #include <string.h>
 
-#include "commands.h"
-#include "logprint.h"
-#include "utils.h"
-#include "hooks.h"
-#include "xmpp.h"
-#include "compl.h"
-#include "xmpp_defines.h"
-#include "screen.h"
-#include "hbuf.h"
+#include <mcabber/commands.h>
+#include <mcabber/logprint.h>
+#include <mcabber/utils.h>
+#include <mcabber/hooks.h>
+#include <mcabber/xmpp.h>
+#include <mcabber/compl.h>
+#include <mcabber/xmpp_defines.h>
+#include <mcabber/screen.h>
+#include <mcabber/hbuf.h>
 
 #include "disco.h"