diff --git a/src/core/Makefile b/src/core/Makefile
index eae159e..5d9ae0f 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -11,6 +11,7 @@ SRCS=	xmpp-commands.c \
 	rosters-tools.c \
 	stanzas.c \
 	tools.c \
+	xep/caps.c \
 	xep/chatstates.c \
 	xep/composing.c \
 	xep/datetime.c \
diff --git a/src/core/module.h b/src/core/module.h
index 3793623..414a539 100644
--- a/src/core/module.h
+++ b/src/core/module.h
@@ -1,5 +1,5 @@
 #define MODULE_NAME "xmpp/core"
 
-#include "irssi-config.h"
-#include "common.h"
+#include <irssi/irssi-config.h>
+#include <irssi/src/common.h>
 #include "xmpp.h"
diff --git a/src/core/protocol.c b/src/core/protocol.c
index 717e022..5a5826c 100644
--- a/src/core/protocol.c
+++ b/src/core/protocol.c
@@ -16,7 +16,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/core/rosters.c b/src/core/rosters.c
index 135bd3b..00b68a4 100644
--- a/src/core/rosters.c
+++ b/src/core/rosters.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/core/stanzas.c b/src/core/stanzas.c
index a731b00..748f64d 100644
--- a/src/core/stanzas.c
+++ b/src/core/stanzas.c
@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"
diff --git a/src/core/tools.c b/src/core/tools.c
index e179aad..4f5aa50 100644
--- a/src/core/tools.c
+++ b/src/core/tools.c
@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #define XMPP_PRIORITY_MIN -128
 #define XMPP_PRIORITY_MAX 127
diff --git a/src/core/xep/caps.c b/src/core/xep/caps.c
new file mode 100644
index 0000000..3e8f68a
--- /dev/null
+++ b/src/core/xep/caps.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2007,2008,2009 Colin DIDIER
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ /* XEP-0115:  Entity Capabilities */
+
+#define XMLNS_CAPS "http://jabber.org/protocol/caps"
+
+#include "module.h"
+#include "caps.h"
+#include "disco.h"
+#include "loudmouth/loudmouth.h"
+
+#include <irssi/src/core/signals.h>
+
+static gchar *
+ver_hash(void)
+{
+	GSList *tmp;
+	GChecksum *sum;
+	GString *str = g_string_new(NULL);
+	guint8 *out;
+	gsize len;
+	gchar *hash;
+	g_string_append(str, "client/console//" IRSSI_XMPP_PACKAGE "<");
+	for (tmp = disco_my_features(); tmp != NULL; tmp = tmp->next) {
+		g_string_append(str, tmp->data);
+		g_string_append_c(str, '<');
+	}
+	sum = g_checksum_new(G_CHECKSUM_SHA1);
+	g_checksum_update(sum, str->str, str->len);
+	len = g_checksum_type_get_length(G_CHECKSUM_SHA1);
+	out = g_new0(guint8, len);
+	g_checksum_get_digest(sum, out, &len);
+	hash = g_base64_encode(out, len);
+	g_free(out);
+	g_checksum_free(sum);
+	return hash;
+}
+
+static void
+sig_add_caps(XMPP_SERVER_REC *server, LmMessage *lmsg)
+{
+	gchar *ver;
+	LmMessageNode *c;
+	ver = ver_hash();
+	c = lm_message_node_add_child(lmsg->node, "c", NULL);
+	lm_message_node_set_attribute(c, "xmlns", XMLNS_CAPS);
+	lm_message_node_set_attribute(c, "hash", "sha-1");
+	lm_message_node_set_attribute(c, "node", "https://github.com/cdidier/irssi-xmpp");
+	lm_message_node_set_attribute(c, "ver", ver);
+	g_free(ver);
+}
+
+void
+caps_init(void)
+{
+	disco_add_feature(XMLNS_CAPS);
+	signal_add("xmpp send presence", sig_add_caps);
+}
+
+void
+caps_deinit(void)
+{
+	signal_remove("xmpp send presence", sig_add_caps);
+}
diff --git a/src/core/xep/caps.h b/src/core/xep/caps.h
new file mode 100644
index 0000000..59ff09f
--- /dev/null
+++ b/src/core/xep/caps.h
@@ -0,0 +1,9 @@
+#ifndef __CAPS_H
+#define __CAPS_H
+
+__BEGIN_DECLS
+void caps_init(void);
+void caps_deinit(void);
+__END_DECLS
+
+#endif
diff --git a/src/core/xep/chatstates.c b/src/core/xep/chatstates.c
index 8a71418..88905d1 100644
--- a/src/core/xep/chatstates.c
+++ b/src/core/xep/chatstates.c
@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "disco.h"
diff --git a/src/core/xep/composing.c b/src/core/xep/composing.c
index f115f18..bc1e20f 100644
--- a/src/core/xep/composing.c
+++ b/src/core/xep/composing.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-queries.h"
diff --git a/src/core/xep/delay.c b/src/core/xep/delay.c
index e5a2403..6a3aaad 100644
--- a/src/core/xep/delay.c
+++ b/src/core/xep/delay.c
@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"
diff --git a/src/core/xep/disco.c b/src/core/xep/disco.c
index 885f5b7..13d8852 100644
--- a/src/core/xep/disco.c
+++ b/src/core/xep/disco.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"
@@ -38,6 +38,12 @@ disco_add_feature(char *feature)
 	    (GCompareFunc)strcmp);
 }
 
+GSList *
+disco_my_features(void)
+{
+	return my_features;
+}
+
 gboolean
 disco_have_feature(GSList *list, const char *feature)
 {
diff --git a/src/core/xep/disco.h b/src/core/xep/disco.h
index eb91c69..2445e00 100644
--- a/src/core/xep/disco.h
+++ b/src/core/xep/disco.h
@@ -3,6 +3,7 @@
 
 __BEGIN_DECLS
 void		disco_add_feature(char *);
+GSList *	disco_my_features(void);
 gboolean	disco_have_feature(GSList *, const char *);
 void		disco_request(XMPP_SERVER_REC *, const char *);
 
diff --git a/src/core/xep/muc-commands.c b/src/core/xep/muc-commands.c
index cf61b35..7e39609 100644
--- a/src/core/xep/muc-commands.c
+++ b/src/core/xep/muc-commands.c
@@ -18,9 +18,9 @@
 #include <stdlib.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-item-def.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/window-item-def.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/core/xep/muc-events.c b/src/core/xep/muc-events.c
index 63575c0..092b691 100644
--- a/src/core/xep/muc-events.c
+++ b/src/core/xep/muc-events.c
@@ -23,10 +23,10 @@
 #include <string.h>
 
 #include "module.h"
-#include "commands.h"
-#include "misc.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "rosters-tools.h"
 #include "tools.h"
diff --git a/src/core/xep/muc-nicklist.c b/src/core/xep/muc-nicklist.c
index 56e3621..50f64b3 100644
--- a/src/core/xep/muc-nicklist.c
+++ b/src/core/xep/muc-nicklist.c
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "rosters.h"
 #include "muc-affiliation.h"
diff --git a/src/core/xep/muc-nicklist.h b/src/core/xep/muc-nicklist.h
index 3c072f2..dbc0102 100644
--- a/src/core/xep/muc-nicklist.h
+++ b/src/core/xep/muc-nicklist.h
@@ -1,7 +1,7 @@
 #ifndef __MUC_NICKLIST_H
 #define __MUC_NICKLIST_H
 
-#include "nicklist.h"
+#include <irssi/src/core/nicklist.h>
 #include "muc.h"
 
 /* Returns XMPP_NICK_REC if it's XMPP channel, NULL if it isn't. */
@@ -16,7 +16,7 @@
 
 
 struct _XMPP_NICK_REC {
-	#include "nick-rec.h"
+	#include <irssi/src/core/nick-rec.h>
 
 	int 	 show;
 	char 	*status;
diff --git a/src/core/xep/muc-reconnect.c b/src/core/xep/muc-reconnect.c
index 7e43c24..36adbc5 100644
--- a/src/core/xep/muc-reconnect.c
+++ b/src/core/xep/muc-reconnect.c
@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "servers-reconnect.h"
-#include "signals.h"
+#include <irssi/src/core/servers-reconnect.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "muc.h"
diff --git a/src/core/xep/muc.c b/src/core/xep/muc.c
index 5e5a419..19db411 100644
--- a/src/core/xep/muc.c
+++ b/src/core/xep/muc.c
@@ -22,9 +22,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "commands.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/commands.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "rosters-tools.h"
 #include "tools.h"
diff --git a/src/core/xep/muc.h b/src/core/xep/muc.h
index 50440f8..b9a1322 100644
--- a/src/core/xep/muc.h
+++ b/src/core/xep/muc.h
@@ -1,8 +1,8 @@
 #ifndef __MUC_H
 #define __MUC_H
 
-#include "channels.h"
-#include "channels-setup.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
 #include "xmpp-servers.h"
 #include "tools.h"
 
@@ -34,7 +34,7 @@
 
 #define STRUCT_SERVER_REC XMPP_SERVER_REC
 struct _MUC_REC {
-	#include "channel-rec.h"
+	#include <irssi/src/core/channel-rec.h>
 
 	char	*nick;
 };
diff --git a/src/core/xep/oob.c b/src/core/xep/oob.c
index 16fdafb..5d61b48 100644
--- a/src/core/xep/oob.c
+++ b/src/core/xep/oob.c
@@ -20,7 +20,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "tools.h"
diff --git a/src/core/xep/ping.c b/src/core/xep/ping.c
index 7d9f32a..d51930a 100644
--- a/src/core/xep/ping.c
+++ b/src/core/xep/ping.c
@@ -24,9 +24,9 @@
 #include <time.h>
 
 #include "module.h"
-#include "misc.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/core/xep/registration.c b/src/core/xep/registration.c
index a049af4..2043939 100644
--- a/src/core/xep/registration.c
+++ b/src/core/xep/registration.c
@@ -23,8 +23,8 @@
 #include <string.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 #include "tools.h"
 
 #include "xmpp-servers.h"
diff --git a/src/core/xep/vcard.c b/src/core/xep/vcard.c
index 00db5e9..06052fc 100644
--- a/src/core/xep/vcard.c
+++ b/src/core/xep/vcard.c
@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "queries.h"
-#include "signals.h"
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/core/xep/version.c b/src/core/xep/version.c
index ff248ab..6c95bb7 100644
--- a/src/core/xep/version.c
+++ b/src/core/xep/version.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "queries.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/queries.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/core/xep/xep.c b/src/core/xep/xep.c
index 8c7bcdf..eb90cec 100644
--- a/src/core/xep/xep.c
+++ b/src/core/xep/xep.c
@@ -32,6 +32,7 @@ void
 xep_init(void)
 {
 	disco_init(); /* init sevice discovery first */
+	caps_init();
 	chatstates_init();
 	composing_init();
 	delay_init();
diff --git a/src/core/xmpp-commands.c b/src/core/xmpp-commands.c
index e8c6a31..85bb7e9 100644
--- a/src/core/xmpp-commands.c
+++ b/src/core/xmpp-commands.c
@@ -18,12 +18,12 @@
 #include <stdlib.h>
 
 #include "module.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-item-def.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/window-item-def.h>
 
 #include "xmpp-commands.h"
 #include "xmpp-queries.h"
diff --git a/src/core/xmpp-commands.h b/src/core/xmpp-commands.h
index 2939810..9685181 100644
--- a/src/core/xmpp-commands.h
+++ b/src/core/xmpp-commands.h
@@ -1,7 +1,7 @@
 #ifndef __XMPP_COMMANDS_H
 #define __XMPP_COMMANDS_H
 
-#include "commands.h"
+#include <irssi/src/core/commands.h>
 
 enum {
 	XMPP_COMMAND_AWAY,
diff --git a/src/core/xmpp-core.c b/src/core/xmpp-core.c
index f1960a8..54a53b1 100644
--- a/src/core/xmpp-core.c
+++ b/src/core/xmpp-core.c
@@ -16,13 +16,13 @@
  */
 
 #include "module.h"
-#include "signals.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "chat-protocols.h"
-#include "chatnets.h"
-#include "servers-setup.h"
-#include "settings.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/chatnets.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/settings.h>
 
 #include "xmpp-commands.h"
 #include "xmpp-queries.h"
diff --git a/src/core/xmpp-queries.c b/src/core/xmpp-queries.c
index 9bfb583..00c59a8 100644
--- a/src/core/xmpp-queries.c
+++ b/src/core/xmpp-queries.c
@@ -18,9 +18,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "channels.h"
-#include "nicklist.h"
-#include "signals.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-queries.h"
 #include "rosters-tools.h"
diff --git a/src/core/xmpp-queries.h b/src/core/xmpp-queries.h
index 972519a..9b29e8b 100644
--- a/src/core/xmpp-queries.h
+++ b/src/core/xmpp-queries.h
@@ -1,7 +1,7 @@
 #ifndef __XMPP_QUERIES_H
 #define __XMPP_QUERIES_H
 
-#include "queries.h"
+#include <irssi/src/core/queries.h>
 #include "xmpp-servers.h"
 
 /* Returns XMPP_QUERY_REC if it's XMPP query, NULL if it isn't. */
@@ -16,7 +16,7 @@
 
 #define STRUCT_SERVER_REC XMPP_SERVER_REC
 struct _XMPP_QUERY_REC {
-	#include "query-rec.h"
+	#include <irssi/src/core/query-rec.h>
 
 	time_t		composing_time;
 	gboolean	composing_visible;
diff --git a/src/core/xmpp-servers-reconnect.c b/src/core/xmpp-servers-reconnect.c
index 09488f5..85ffe09 100644
--- a/src/core/xmpp-servers-reconnect.c
+++ b/src/core/xmpp-servers-reconnect.c
@@ -16,7 +16,7 @@
  */
 
 #include "module.h"
-#include "signals.h"
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 
diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c
index 7be48b9..afc2ffb 100644
--- a/src/core/xmpp-servers.c
+++ b/src/core/xmpp-servers.c
@@ -22,10 +22,10 @@
 #include <termios.h>
 
 #include "module.h"
-#include "network.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/network.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "protocol.h"
diff --git a/src/core/xmpp-servers.h b/src/core/xmpp-servers.h
index 6d946c5..b56d841 100644
--- a/src/core/xmpp-servers.h
+++ b/src/core/xmpp-servers.h
@@ -1,8 +1,8 @@
 #ifndef __XMPP_SERVERS_H
 #define __XMPP_SERVERS_H
 
-#include "chat-protocols.h"
-#include "servers.h"
+#include <irssi/src/core/chat-protocols.h>
+#include <irssi/src/core/servers.h>
 
 #include "loudmouth/loudmouth.h"
 #include "loudmouth-tools.h"
@@ -24,7 +24,7 @@
 	(XMPP_SERVER_CONNECT(conn) ? TRUE : FALSE) 
 
 struct _XMPP_SERVER_CONNECT_REC {
-	#include "server-connect-rec.h"
+	#include <irssi/src/core/server-connect-rec.h>
 
 	GSList		*channels_list;
 	int		 show;
@@ -35,7 +35,7 @@ struct _XMPP_SERVER_CONNECT_REC {
 
 #define STRUCT_SERVER_CONNECT_REC XMPP_SERVER_CONNECT_REC
 struct _XMPP_SERVER_REC {
-	#include "server-rec.h"
+	#include <irssi/src/core/server-rec.h>
 
 	char		*jid;
 	char		*user;
diff --git a/src/core/xmpp-settings.c b/src/core/xmpp-settings.c
index a8a58b4..d39c827 100644
--- a/src/core/xmpp-settings.c
+++ b/src/core/xmpp-settings.c
@@ -18,8 +18,8 @@
 #include <string.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters.h"
diff --git a/src/fe-common/fe-rosters.c b/src/fe-common/fe-rosters.c
index 8dc28a2..f82a0ba 100644
--- a/src/fe-common/fe-rosters.c
+++ b/src/fe-common/fe-rosters.c
@@ -18,11 +18,11 @@
 #include <string.h>
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "settings.h"
-#include "signals.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/fe-stanzas.c b/src/fe-common/fe-stanzas.c
index 904ec70..b54b2cf 100644
--- a/src/fe-common/fe-stanzas.c
+++ b/src/fe-common/fe-stanzas.c
@@ -18,12 +18,12 @@
 #include <string.h>
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 
diff --git a/src/fe-common/fe-xmpp-core.c b/src/fe-common/fe-xmpp-core.c
index 4450dcd..7c2e4ce 100644
--- a/src/fe-common/fe-xmpp-core.c
+++ b/src/fe-common/fe-xmpp-core.c
@@ -16,14 +16,14 @@
  */
 
 #include "module.h"
-#include "core.h"
-#include "levels.h"
+#include <irssi/src/core/core.h>
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "servers-setup.h"
-#include "settings.h"
-#include "signals.h"
-#include "themes.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/servers-setup.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/themes.h>
 
 #include "fe-xmpp-messages.h"
 #include "fe-xmpp-queries.h"
diff --git a/src/fe-common/fe-xmpp-messages.c b/src/fe-common/fe-xmpp-messages.c
index df293f3..641bc7f 100644
--- a/src/fe-common/fe-xmpp-messages.c
+++ b/src/fe-common/fe-xmpp-messages.c
@@ -18,20 +18,20 @@
 #include <string.h>
 
 #include "module.h"
-#include "channels.h"
-#include "levels.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "nicklist.h"
-#include "printtext.h"
-#include "recode.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-items.h"
-#include "fe-queries.h"
-#include "fe-common/core/module-formats.h"
-#include "fe-common/core/fe-messages.h"
-#include "fe-common/irc/module-formats.h"
-#include "irssi-version.h"
+#include <irssi/src/core/nicklist.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/recode.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/fe-messages.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
+#include <irssi/irssi-version.h>
 
 #include "xmpp-servers.h"
 
diff --git a/src/fe-common/fe-xmpp-queries.c b/src/fe-common/fe-xmpp-queries.c
index 63b9d50..af0e253 100644
--- a/src/fe-common/fe-xmpp-queries.c
+++ b/src/fe-common/fe-xmpp-queries.c
@@ -16,11 +16,11 @@
  */		 
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "signals.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-queries.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/fe-xmpp-status.c b/src/fe-common/fe-xmpp-status.c
index 46012af..61c9e83 100644
--- a/src/fe-common/fe-xmpp-status.c
+++ b/src/fe-common/fe-xmpp-status.c
@@ -18,12 +18,12 @@
 #include <string.h>
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-items.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/fe-xmpp-windows.c b/src/fe-common/fe-xmpp-windows.c
index 4de0220..2c6e45b 100644
--- a/src/fe-common/fe-xmpp-windows.c
+++ b/src/fe-common/fe-xmpp-windows.c
@@ -16,9 +16,9 @@
  */		 
 
 #include "module.h"
-#include "channels.h"
-#include "signals.h"
-#include "window-items.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 
diff --git a/src/fe-common/module-formats.c b/src/fe-common/module-formats.c
index 148c1f1..ce85fb2 100644
--- a/src/fe-common/module-formats.c
+++ b/src/fe-common/module-formats.c
@@ -16,7 +16,7 @@
  */
 
 #include "module.h"
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 FORMAT_REC fecommon_xmpp_formats[] = {
 	{ MODULE_NAME, "XMPP", 0, { 0 } },
diff --git a/src/fe-common/module-formats.h b/src/fe-common/module-formats.h
index e4e53c5..947876f 100644
--- a/src/fe-common/module-formats.h
+++ b/src/fe-common/module-formats.h
@@ -1,4 +1,4 @@
-#include "formats.h"
+#include <irssi/src/fe-common/core/formats.h>
 
 enum {
 	XMPPTXT_MODULE_NAME,
diff --git a/src/fe-common/module.h b/src/fe-common/module.h
index e41c292..579f613 100644
--- a/src/fe-common/module.h
+++ b/src/fe-common/module.h
@@ -3,6 +3,6 @@
 #define CORE_MODULE_NAME "fe-common/core"
 #define IRC_MODULE_NAME "fe-common/irc"
 
-#include "irssi-config.h"
-#include "common.h"
+#include <irssi/irssi-config.h>
+#include <irssi/src/common.h>
 #include "xmpp.h"
diff --git a/src/fe-common/xep/fe-composing.c b/src/fe-common/xep/fe-composing.c
index b342114..11b83dd 100644
--- a/src/fe-common/xep/fe-composing.c
+++ b/src/fe-common/xep/fe-composing.c
@@ -18,10 +18,10 @@
 #include <string.h>
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
-#include "special-vars.h"
-#include "window-items.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/core/special-vars.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-queries.h"
diff --git a/src/fe-common/xep/fe-delay.c b/src/fe-common/xep/fe-delay.c
index 33cef7e..09a40c2 100644
--- a/src/fe-common/xep/fe-delay.c
+++ b/src/fe-common/xep/fe-delay.c
@@ -16,17 +16,17 @@
  */		 
 
 #include "module.h"
-#include "levels.h"
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-items.h"
-#include "fe-messages.h"
-#include "fe-queries.h"
-#include "fe-common/core/module-formats.h"
-#include "fe-common/core/fe-messages.h"
-#include "fe-common/irc/module-formats.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/fe-messages.h>
+#include <irssi/src/fe-common/core/fe-queries.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/core/fe-messages.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/xep/fe-muc.c b/src/fe-common/xep/fe-muc.c
index c2df9ed..0747efb 100644
--- a/src/fe-common/xep/fe-muc.c
+++ b/src/fe-common/xep/fe-muc.c
@@ -16,14 +16,14 @@
  */
 
 #include "module.h"
-#include "ignore.h"
-#include "levels.h"
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "signals.h"
-#include "window-items.h"
-#include "fe-common/core/module-formats.h"
-#include "fe-common/irc/module-formats.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/fe-common/xep/fe-ping.c b/src/fe-common/xep/fe-ping.c
index 4ac2515..e2dbc6f 100644
--- a/src/fe-common/xep/fe-ping.c
+++ b/src/fe-common/xep/fe-ping.c
@@ -16,10 +16,10 @@
  */		 
 
 #include "module.h"
-#include "levels.h"
-#include "printtext.h"
-#include "signals.h"
-#include "fe-common/irc/module-formats.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/xep/fe-registration.c b/src/fe-common/xep/fe-registration.c
index cff905a..985ac6d 100644
--- a/src/fe-common/xep/fe-registration.c
+++ b/src/fe-common/xep/fe-registration.c
@@ -16,13 +16,13 @@
  */
 
 #include "module.h"
-#include "ignore.h"
-#include "levels.h"
+#include <irssi/src/core/ignore.h>
+#include <irssi/src/core/levels.h>
 #include "module-formats.h"
-#include "printtext.h"
-#include "signals.h"
-#include "fe-common/core/module-formats.h"
-#include "fe-common/irc/module-formats.h"
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/module-formats.h>
+#include <irssi/src/fe-common/irc/module-formats.h>
 
 #include "xmpp-servers.h"
 #include "xep/registration.h"
diff --git a/src/fe-common/xep/fe-vcard.c b/src/fe-common/xep/fe-vcard.c
index 5682d31..1d6c190 100644
--- a/src/fe-common/xep/fe-vcard.c
+++ b/src/fe-common/xep/fe-vcard.c
@@ -16,9 +16,9 @@
  */		 
 
 #include "module.h"
-#include "levels.h"
-#include "printtext.h"
-#include "signals.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/xep/fe-version.c b/src/fe-common/xep/fe-version.c
index 9e135a3..0d3c290 100644
--- a/src/fe-common/xep/fe-version.c
+++ b/src/fe-common/xep/fe-version.c
@@ -16,9 +16,9 @@
  */		 
 
 #include "module.h"
-#include "levels.h"
-#include "printtext.h"
-#include "signals.h"
+#include <irssi/src/core/levels.h>
+#include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/core/signals.h>
 
 #include "xmpp-servers.h"
 #include "rosters-tools.h"
diff --git a/src/fe-common/xmpp-completion.c b/src/fe-common/xmpp-completion.c
index 4e562a1..bf206f5 100644
--- a/src/fe-common/xmpp-completion.c
+++ b/src/fe-common/xmpp-completion.c
@@ -18,12 +18,12 @@
 #include <string.h>
 
 #include "module.h"
-#include "channels.h"
-#include "channels-setup.h"
-#include "misc.h"
-#include "settings.h"
-#include "signals.h"
-#include "window-items.h"
+#include <irssi/src/core/channels.h>
+#include <irssi/src/core/channels-setup.h>
+#include <irssi/src/core/misc.h>
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-commands.h"
diff --git a/src/fe-common/xmpp-formats.c b/src/fe-common/xmpp-formats.c
index a781379..f4a1c4a 100644
--- a/src/fe-common/xmpp-formats.c
+++ b/src/fe-common/xmpp-formats.c
@@ -16,8 +16,8 @@
  */
 
 #include "module.h"
-#include "formats.h"
-#include "signals.h"
+#include <irssi/src/fe-common/core/formats.h>
+#include <irssi/src/core/signals.h>
 
 static void
 sig_strip_codes(const char *in, const char **out)
diff --git a/src/fe-text/module.h b/src/fe-text/module.h
index 3caacfb..d9696ba 100644
--- a/src/fe-text/module.h
+++ b/src/fe-text/module.h
@@ -1,5 +1,5 @@
 #define MODULE_NAME "xmpp/text"
 
-#include "irssi-config.h"
-#include "common.h"
+#include <irssi/irssi-config.h>
+#include <irssi/src/common.h>
 #include "xmpp.h"
diff --git a/src/fe-text/text-xmpp-core.c b/src/fe-text/text-xmpp-core.c
index 05cdba5..beb539e 100644
--- a/src/fe-text/text-xmpp-core.c
+++ b/src/fe-text/text-xmpp-core.c
@@ -16,7 +16,7 @@
  */
 
 #include "module.h"
-#include "modules.h"
+#include <irssi/src/core/modules.h>
 
 #include "xep/text-xep.h"
 
diff --git a/src/fe-text/xep/text-composing.c b/src/fe-text/xep/text-composing.c
index 79dbb09..641302e 100644
--- a/src/fe-text/xep/text-composing.c
+++ b/src/fe-text/xep/text-composing.c
@@ -18,10 +18,9 @@
 #include <string.h>
 
 #include "module.h"
-#include "module-formats.h"
-#include "signals.h"
-#include "statusbar-item.h"
-#include "window-items.h"
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-text/statusbar-item.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 #include "xmpp-queries.h"
diff --git a/src/fe-text/xep/text-muc.c b/src/fe-text/xep/text-muc.c
index b8c1345..4cf8969 100644
--- a/src/fe-text/xep/text-muc.c
+++ b/src/fe-text/xep/text-muc.c
@@ -16,10 +16,10 @@
  */
 
 #include "module.h"
-#include "settings.h"
-#include "signals.h"
-#include "statusbar-item.h"
-#include "window-items.h"
+#include <irssi/src/core/settings.h>
+#include <irssi/src/core/signals.h>
+#include <irssi/src/fe-text/statusbar-item.h>
+#include <irssi/src/fe-common/core/window-items.h>
 
 #include "xmpp-servers.h"
 #include "xep/muc.h"