12 files changed, 12 insertions, 12 deletions
diff --git a/src/chat_state.c b/src/chat_state.c
index cac73817..836d313f 100644
--- a/src/chat_state.c
+++ b/src/chat_state.c
@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include "chat_state.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "window_list.h"
 #include "ui/win_types.h"
 #include "xmpp/xmpp.h"
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index 34f840ed..9f1f31ff 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -48,7 +48,7 @@
 
 #include <glib.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_ac.h"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 65982541..8d1d27a9 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -49,7 +49,7 @@
 #include <langinfo.h>
 #include <ctype.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_funcs.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
diff --git a/src/event/client_events.c b/src/event/client_events.c
index 65843c44..ebbdd1ed 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -42,7 +42,7 @@
 #include "window_list.h"
 #include "xmpp/xmpp.h"
 #include "roster_list.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "plugins/plugins.h"
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
diff --git a/src/event/server_events.c b/src/event/server_events.c
index c73bcbdd..0d511836 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "log.h"
 #include "muc.h"
 #include "config/preferences.h"
diff --git a/src/otr/otr.c b/src/otr/otr.c
index b3ce4e5f..c9769d35 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -47,7 +47,7 @@
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 #include "config/preferences.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 #define PRESENCE_ONLINE 1
 #define PRESENCE_OFFLINE 0
diff --git a/src/profanity.c b/src/profanity.c
index ed534d11..5799568c 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -48,7 +48,7 @@
 #include <glib.h>
 
 #include "profanity.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "chat_state.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 25df09c4..b1de9489 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "window_list.h"
 #include "roster_list.h"
 #include "log.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index df759ca6..9ee3c4c3 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -54,7 +54,7 @@
 #include <ncurses.h>
 #endif
 
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 #include "command/cmd_defs.h"
 #include "command/cmd_ac.h"
 #include "common.h"
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index a2817698..3381f99e 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -47,7 +47,7 @@
 #include "window_list.h"
 #include "ui/window.h"
 #include "roster_list.h"
-#include "chat_session.h"
+#include "xmpp/chat_session.h"
 
 static WINDOW *win;
 static contact_presence_t current_presence;
diff --git a/src/chat_session.c b/src/xmpp/chat_session.c
index 7e844871..7e844871 100644
--- a/src/chat_session.c
+++ b/src/xmpp/chat_session.c
diff --git a/src/chat_session.h b/src/xmpp/chat_session.h
index 604d2319..705799a1 100644
--- a/src/chat_session.h
+++ b/src/xmpp/chat_session.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CHAT_SESSION_H
-#define CHAT_SESSION_H
+#ifndef XMPP_CHAT_SESSION_H
+#define XMPP_CHAT_SESSION_H
 
 #include <glib.h>