diff --git a/src/event/server_events.c b/src/event/server_events.c
index b875c22e..6afde171 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -49,7 +49,7 @@
 #include "event/common.h"
 #include "plugins/plugins.h"
 #include "ui/window_list.h"
-#include "xmpp/connection.h"
+#include "xmpp/xmpp.h"
 #include "xmpp/muc.h"
 #include "xmpp/chat_session.h"
 #include "xmpp/roster_list.h"
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index 157b252c..3f15df82 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -64,6 +64,4 @@ void connection_remove_available_resource(const char *const resource);
 
 char* connection_create_stanza_id(void);
 
-char *connection_get_profanity_identifier(void);
-
 #endif
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index ae6df097..29c0a9f0 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -140,6 +140,8 @@ GList* connection_get_available_resources(void);
 gboolean connection_supports(const char *const feature);
 char* connection_jid_for_feature(const char *const feature);
 
+char *connection_get_profanity_identifier(void);
+
 char* message_send_chat(const char *const barejid, const char *const msg, const char *const oob_url,
     gboolean request_receipt);
 char* message_send_chat_otr(const char *const barejid, const char *const msg, gboolean request_receipt);
diff --git a/tests/unittests/test_server_events.c b/tests/unittests/test_server_events.c
index 282c1ffe..54688dec 100644
--- a/tests/unittests/test_server_events.c
+++ b/tests/unittests/test_server_events.c
@@ -7,6 +7,7 @@
 #include <glib.h>
 
 #include "event/server_events.h"
+#include "xmpp/xmpp.h"
 #include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 #include "config/preferences.h"
diff --git a/tests/unittests/xmpp/stub_connection.c b/tests/unittests/xmpp/stub_connection.c
new file mode 100644
index 00000000..3e22e539
--- /dev/null
+++ b/tests/unittests/xmpp/stub_connection.c
@@ -0,0 +1,7 @@
+#include "xmpp/message.h"
+
+ProfMessage *message_init(void) {
+    return NULL;
+}
+
+void message_free(ProfMessage *message) {}
diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c
index 41870d73..5c74a338 100644
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -92,6 +92,10 @@ connection_supports(const char *const feature)
     return FALSE;
 }
 
+char *connection_get_profanity_identifier(void) {
+    return "profident";
+}
+
 // message functions
 char* message_send_chat(const char * const barejid, const char * const msg, const char *const oob_url,
     gboolean request_receipt)