diff --git a/Makefile.am b/Makefile.am
index 263161a2..cbfe82c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ core_sources = \
 	src/xmpp/contact.c src/xmpp/contact.h src/log.c src/common.c \
 	src/log.h src/profanity.c src/common.h \
 	src/profanity.h src/xmpp/chat_session.c \
-	src/xmpp/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
+	src/xmpp/chat_session.h src/muc.c src/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/roster_list.c src/roster_list.h \
@@ -60,7 +60,7 @@ unittest_sources = \
 	src/xmpp/contact.c src/xmpp/contact.h src/common.c \
 	src/log.h src/profanity.c src/common.h \
 	src/profanity.h src/xmpp/chat_session.c \
-	src/xmpp/chat_session.h src/muc.c src/muc.h src/jid.h src/jid.c \
+	src/xmpp/chat_session.h src/muc.c src/muc.h src/xmpp/jid.h src/xmpp/jid.c \
 	src/resource.c src/resource.h \
 	src/xmpp/chat_state.h src/xmpp/chat_state.c \
 	src/roster_list.c src/roster_list.h \
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index d390a64a..852a3cf8 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -60,7 +60,7 @@
 #include "config/scripts.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #include "plugins/plugins.h"
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index f661e6a9..b9f9cb14 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -62,7 +62,7 @@
 #include "config/scripts.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #ifdef HAVE_LIBOTR
diff --git a/src/config/account.c b/src/config/account.c
index 14751081..0a2c9132 100644
--- a/src/config/account.c
+++ b/src/config/account.c
@@ -38,7 +38,7 @@
 
 #include <glib.h>
 
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "config/account.h"
 #include "common.h"
 #include "log.h"
diff --git a/src/config/accounts.c b/src/config/accounts.c
index aa3dfbb0..c504b5d3 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -43,7 +43,7 @@
 #include "common.h"
 #include "config/account.h"
 #include "config/conflists.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "tools/autocomplete.h"
 #include "xmpp/xmpp.h"
diff --git a/src/muc.c b/src/muc.c
index 642e71f4..884ddd34 100644
--- a/src/muc.c
+++ b/src/muc.c
@@ -40,7 +40,7 @@
 
 #include "xmpp/contact.h"
 #include "common.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
 #include "window_list.h"
diff --git a/src/muc.h b/src/muc.h
index a2482fd9..7bacb18d 100644
--- a/src/muc.h
+++ b/src/muc.h
@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include "xmpp/contact.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/win_types.h"
 
diff --git a/src/roster_list.c b/src/roster_list.c
index 4044a09e..816eed27 100644
--- a/src/roster_list.c
+++ b/src/roster_list.c
@@ -42,7 +42,7 @@
 #include "roster_list.h"
 #include "resource.h"
 #include "xmpp/contact.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "config/preferences.h"
 
diff --git a/src/ui/core.c b/src/ui/core.c
index a1b14904..d90d1aa6 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -62,7 +62,7 @@
 #include "config/theme.h"
 #include "xmpp/contact.h"
 #include "roster_list.h"
-#include "jid.h"
+#include "xmpp/jid.h"
 #include "log.h"
 #include "muc.h"
 #ifdef HAVE_LIBOTR
diff --git a/src/jid.c b/src/xmpp/jid.c
similarity index 100%
rename from src/jid.c
rename to src/xmpp/jid.c
diff --git a/src/jid.h b/src/xmpp/jid.h
similarity index 98%
rename from src/jid.h
rename to src/xmpp/jid.h
index d74a6d3f..d82c3add 100644
--- a/src/jid.h
+++ b/src/xmpp/jid.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef JID_H
-#define JID_H
+#ifndef XMPP_JID_H
+#define XMPP_JID_H
 
 #include <glib.h>
 
diff --git a/tests/unittests/test_jid.c b/tests/unittests/test_jid.c
index ff5f4c9a..b7f6ea22 100644
--- a/tests/unittests/test_jid.c
+++ b/tests/unittests/test_jid.c
@@ -4,7 +4,7 @@
 #include <cmocka.h>
 #include <stdlib.h>
 
-#include "jid.h"
+#include "xmpp/jid.h"
 
 void create_jid_from_null_returns_null(void **state)
 {
@@ -182,4 +182,4 @@ void returns_barejid_when_fulljid_not_exists(void **state)
     char *result = jid_fulljid_or_barejid(jid);
 
     assert_string_equal("localpart@domainpart", result);
-}
\ No newline at end of file
+}