6 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 36af73cd..30184358 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ core_sources = \
 	src/profanity.h src/xmpp/chat_session.c \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
 	src/xmpp/chat_state.h src/xmpp/chat_state.c \
-	src/resource.c src/resource.h \
+	src/xmpp/resource.c src/xmpp/resource.h \
 	src/roster_list.c src/roster_list.h \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/session.c \
 	src/xmpp/connection.h src/xmpp/connection.c \
@@ -61,7 +61,7 @@ unittest_sources = \
 	src/log.h src/profanity.c src/common.h \
 	src/profanity.h src/xmpp/chat_session.c \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
-	src/resource.c src/resource.h \
+	src/xmpp/resource.c src/xmpp/resource.h \
 	src/xmpp/chat_state.h src/xmpp/chat_state.c \
 	src/roster_list.c src/roster_list.h \
 	src/xmpp/xmpp.h src/xmpp/form.c \
diff --git a/src/profanity.c b/src/profanity.c
index 8dec09cf..5955ae72 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -68,7 +68,7 @@
 #ifdef HAVE_LIBGPGME
 #include "pgp/gpg.h"
 #endif
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/xmpp.h"
 #include "ui/ui.h"
 #include "window_list.h"
diff --git a/src/roster_list.c b/src/roster_list.c
index 816eed27..789449c2 100644
--- a/src/roster_list.c
+++ b/src/roster_list.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 
 #include "roster_list.h"
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/contact.h"
 #include "xmpp/jid.h"
 #include "tools/autocomplete.h"
diff --git a/src/roster_list.h b/src/roster_list.h
index 1b695b76..70dd540f 100644
--- a/src/roster_list.h
+++ b/src/roster_list.h
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include "resource.h"
+#include "xmpp/resource.h"
 #include "xmpp/contact.h"
 
 typedef enum {
diff --git a/src/resource.c b/src/xmpp/resource.c
index 2c448882..6e6bc5f0 100644
--- a/src/resource.c
+++ b/src/xmpp/resource.c
@@ -36,8 +36,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <common.h>
-#include <resource.h>
+#include "common.h"
+#include "xmpp/resource.h"
 
 Resource*
 resource_new(const char *const name, resource_presence_t presence, const char *const status, const int priority)
diff --git a/src/resource.h b/src/xmpp/resource.h
index c7b00c6a..22681013 100644
--- a/src/resource.h
+++ b/src/xmpp/resource.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#ifndef XMPP_RESOURCE_H
+#define XMPP_RESOURCE_H
 
 #include "common.h"