Moved roster_list.c

17 files changed, 17 insertions, 17 deletions

diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index 2c8c02dd..20993a5b 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -48,7 +48,7 @@
 #include "config/scripts.h"
 #include "xmpp/muc.h"
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "window_list.h"
 #include "plugins/plugins.h"
 #include "command/cmd_ac.h"
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index 5ade93e3..8babde06 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -59,7 +59,7 @@
 #include "config/tlscerts.h"
 #include "config/scripts.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index d7f4c8dc..fbcd944b 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -61,7 +61,7 @@
 #include "config/tlscerts.h"
 #include "config/scripts.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"
diff --git a/src/event/client_events.c b/src/event/client_events.c
index ebbdd1ed..0107d496 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -41,7 +41,7 @@
 #include "ui/ui.h"
 #include "window_list.h"
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 #include "plugins/plugins.h"
 #ifdef HAVE_LIBOTR
diff --git a/src/event/server_events.c b/src/event/server_events.c
index a12e5a37..090a0fca 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -44,7 +44,7 @@
 #include "config/preferences.h"
 #include "config/account.h"
 #include "config/scripts.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "plugins/plugins.h"
 #include "window_list.h"
 #include "config/tlscerts.h"
diff --git a/src/otr/otr.c b/src/otr/otr.c
index 2ece01f3..bcf64e66 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -41,7 +41,7 @@
 #include "otr/otr.h"
 #include "otr/otrlib.h"
 #include "log.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "window_list.h"
 #include "xmpp/contact.h"
 #include "ui/ui.h"
diff --git a/src/profanity.c b/src/profanity.c
index 5955ae72..691f39d7 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -57,7 +57,7 @@
 #include "command/cmd_defs.h"
 #include "common.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/tlscerts.h"
 #include "log.h"
 #include "xmpp/muc.h"
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index b1de9489..ca428821 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -40,7 +40,7 @@
 
 #include "xmpp/chat_session.h"
 #include "window_list.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "log.h"
 #include "config/preferences.h"
 #include "ui/ui.h"
diff --git a/src/ui/console.c b/src/ui/console.c
index 182e365f..3122b2d6 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -47,7 +47,7 @@
 #include "common.h"
 #include "log.h"
 #include "xmpp/muc.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "ui/window.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index cef4cc22..cca836f7 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -61,7 +61,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 4cd8f3e1..1f5c69cc 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -62,7 +62,7 @@
 #include "log.h"
 #include "xmpp/muc.h"
 #include "profanity.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index c8c0ae52..06d34894 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -41,7 +41,7 @@
 #include "ui/window.h"
 #include "window_list.h"
 #include "config/preferences.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 
 typedef enum {
     ROSTER_CONTACT,
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 3381f99e..67764221 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -46,7 +46,7 @@
 #include "ui/inputwin.h"
 #include "window_list.h"
 #include "ui/window.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 
 static WINDOW *win;
diff --git a/src/ui/window.c b/src/ui/window.c
index 9e641dcd..9b210972 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -49,7 +49,7 @@
 
 #include "config/theme.h"
 #include "config/preferences.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "xmpp/xmpp.h"
diff --git a/src/window_list.c b/src/window_list.c
index 2d4de286..1e5ff426 100644
--- a/src/window_list.c
+++ b/src/window_list.c
@@ -41,7 +41,7 @@
 #include <glib.h>
 
 #include "common.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/theme.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
diff --git a/src/roster_list.c b/src/xmpp/roster_list.c
index 789449c2..789449c2 100644
--- a/src/roster_list.c
+++ b/src/xmpp/roster_list.c
diff --git a/src/roster_list.h b/src/xmpp/roster_list.h
index 70dd540f..843c2546 100644
--- a/src/roster_list.h
+++ b/src/xmpp/roster_list.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ROSTER_LIST_H
-#define ROSTER_LIST_H
+#ifndef XMPP_ROSTER_LIST_H
+#define XMPP_ROSTER_LIST_H
 
 #include <glib.h>