16 files changed, 26 insertions, 15 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am
index ca46c477..5a4eaeef 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -5,6 +5,8 @@ pkgconfig_DATA = telepathy-salut.pc
 salutincludedir = $(includedir)/telepathy-salut-0/salut
 salutinclude_HEADERS = \
     plugin.h \
-    protocol.h
+    protocol.h \
+    capabilities-set.h \
+    caps-channel-manager.h
 
 endif
diff --git a/src/capabilities-set.h b/salut/capabilities-set.h
index 3f215259..3f215259 100644
--- a/src/capabilities-set.h
+++ b/salut/capabilities-set.h
diff --git a/src/caps-channel-manager.h b/salut/caps-channel-manager.h
index e5623bbf..e5623bbf 100644
--- a/src/caps-channel-manager.h
+++ b/salut/caps-channel-manager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 56387ef3..6bf9618a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,9 +24,9 @@ noinst_PROGRAMS = write-mgr-file
 CORE_SOURCES =                                          \
     capabilities.c \
     capabilities.h \
-    capabilities-set.h \
+    $(top_srcdir)/salut/capabilities-set.h \
     caps-channel-manager.c \
-    caps-channel-manager.h \
+    $(top_srcdir)/salut/caps-channel-manager.h \
     gabble_namespaces.h \
     namespaces.h \
     salut-capabilities.c                                \
diff --git a/src/capabilities.h b/src/capabilities.h
index 52b4b0f6..66e21848 100644
--- a/src/capabilities.h
+++ b/src/capabilities.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "capabilities-set.h"
+#include <salut/capabilities-set.h>
 
 /* Pseudo-capabilities for buggy or strange implementations, represented as
  * strings starting with a character not allowed in XML (the ASCII beep :-) */
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index 746a828f..cc9a8be2 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -21,7 +21,8 @@
  */
 
 #include "config.h"
-#include "caps-channel-manager.h"
+
+#include <salut/caps-channel-manager.h>
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/channel-manager.h>
diff --git a/src/salut-capabilities.h b/src/salut-capabilities.h
index f12c327b..234f26c9 100644
--- a/src/salut-capabilities.h
+++ b/src/salut-capabilities.h
@@ -22,7 +22,7 @@
 #define __SALUT_CAPABILITIES__H__
 
 #include <glib-object.h>
-#include "capabilities-set.h"
+#include <salut/capabilities-set.h>
 
 GabbleCapabilitySet *salut_dup_self_advertised_caps (void);
 
diff --git a/src/salut-connection.c b/src/salut-connection.c
index 5e9fadb6..f45fa134 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -42,8 +42,9 @@
 
 #include <gibber/gibber-namespaces.h>
 
+#include <salut/caps-channel-manager.h>
+
 #include "capabilities.h"
-#include "caps-channel-manager.h"
 #include "salut-avahi-discovery-client.h"
 #include "salut-capabilities.h"
 #include "salut-caps-hash.h"
diff --git a/src/salut-contact-manager.c b/src/salut-contact-manager.c
index 20f22eb6..0b648a0a 100644
--- a/src/salut-contact-manager.c
+++ b/src/salut-contact-manager.c
@@ -23,7 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "caps-channel-manager.h"
+#include <salut/caps-channel-manager.h>
+
 #include "salut-connection.h"
 #include "salut-contact-channel.h"
 #include "salut-contact-manager.h"
diff --git a/src/salut-contact.h b/src/salut-contact.h
index a71494e1..cb07d581 100644
--- a/src/salut-contact.h
+++ b/src/salut-contact.h
@@ -27,7 +27,7 @@
 
 #include <telepathy-glib/handle-repo.h>
 
-#include "capabilities-set.h"
+#include <salut/capabilities-set.h>
 #include "salut-presence.h"
 #include "salut-connection.h"
 #ifdef ENABLE_OLPC
diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index 10025f11..6fb021ac 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -30,7 +30,8 @@
 #include "salut-ft-manager.h"
 #include "salut-signals-marshal.h"
 
-#include "caps-channel-manager.h"
+#include <salut/caps-channel-manager.h>
+
 #include "salut-file-transfer-channel.h"
 #include "salut-contact-manager.h"
 #include "salut-presence-cache.h"
diff --git a/src/salut-im-manager.c b/src/salut-im-manager.c
index cd310255..d7cc58bb 100644
--- a/src/salut-im-manager.c
+++ b/src/salut-im-manager.c
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <salut/caps-channel-manager.h>
+
 #include "extensions/extensions.h"
-#include "caps-channel-manager.h"
 #include "salut-im-channel.h"
 #include "salut-im-manager.h"
 #include "salut-contact.h"
diff --git a/src/salut-muc-manager.c b/src/salut-muc-manager.c
index 9f473295..ed515425 100644
--- a/src/salut-muc-manager.c
+++ b/src/salut-muc-manager.c
@@ -29,7 +29,8 @@
 #include <gibber/gibber-namespaces.h>
 #include <gibber/gibber-xmpp-error.h>
 
-#include "caps-channel-manager.h"
+#include <salut/caps-channel-manager.h>
+
 #include "salut-muc-channel.h"
 #include "salut-contact-manager.h"
 #include "salut-tubes-channel.h"
diff --git a/src/salut-roomlist-manager.c b/src/salut-roomlist-manager.c
index b786ec90..2f4f0c01 100644
--- a/src/salut-roomlist-manager.c
+++ b/src/salut-roomlist-manager.c
@@ -29,7 +29,8 @@
 #include <gibber/gibber-namespaces.h>
 #include <gibber/gibber-xmpp-error.h>
 
-#include "caps-channel-manager.h"
+#include <salut/caps-channel-manager.h>
+
 #include "salut-roomlist-channel.h"
 #include "salut-contact-manager.h"
 #include "salut-muc-manager.h"
diff --git a/src/salut-self.h b/src/salut-self.h
index 6d52b07a..94f9c805 100644
--- a/src/salut-self.h
+++ b/src/salut-self.h
@@ -28,7 +28,8 @@
 
 #include <wocky/wocky-stanza.h>
 
-#include "capabilities-set.h"
+#include <salut/capabilities-set.h>
+
 #include "salut-connection.h"
 #include "salut-presence.h"
 #ifdef ENABLE_OLPC
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 6f478e33..c71bd979 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -37,7 +37,8 @@
 
 #define DEBUG_FLAG DEBUG_TUBES
 
-#include "caps-channel-manager.h"
+#include <salut/caps-channel-manager.h>
+
 #include "debug.h"
 #include "extensions/extensions.h"
 #include "salut-connection.h"