diff --git a/src/config/scripts.c b/src/config/scripts.c
index d40c72a1..03ed6b99 100644
--- a/src/config/scripts.c
+++ b/src/config/scripts.c
@@ -159,7 +159,7 @@ scripts_exec(const char *const script)
     while ((read = getline(&line, &len, scriptfile)) != -1) {
         ProfWin *win = wins_get_current();
         cmd_process_input(win, line);
-        session_process_events(10);
+        session_process_events();
         ui_update();
     }
 
diff --git a/src/profanity.c b/src/profanity.c
index f5540d3a..ed534d11 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -129,7 +129,7 @@ prof_run(char *log_level, char *account_name)
 #endif
         plugins_run_timed();
         notify_remind();
-        session_process_events(10);
+        session_process_events();
         iq_autoping_check();
         ui_update();
 #ifdef HAVE_GTK
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index e9ad22b9..c590b7ba 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -90,6 +90,12 @@ connection_init(void)
     conn.available_resources = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)resource_destroy);
 }
 
+void
+connection_check_events(void)
+{
+    xmpp_run_once(conn.xmpp_ctx, 10);
+}
+
 void
 connection_shutdown(void)
 {
@@ -191,7 +197,7 @@ connection_disconnect(void)
     xmpp_disconnect(conn.xmpp_conn);
 
     while (conn.conn_status == JABBER_DISCONNECTING) {
-        session_process_events(10);
+        session_process_events();
     }
 
     if (conn.xmpp_conn) {
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index b7250d14..ef997a29 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -39,6 +39,7 @@
 
 void connection_init(void);
 void connection_shutdown(void);
+void connection_check_events(void);
 
 jabber_conn_status_t connection_connect(const char *const fulljid, const char *const passwd, const char *const altdomain, int port,
     const char *const tls_policy);
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index faffe653..6dc94aef 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -38,13 +38,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-#ifdef HAVE_LIBSTROPHE
-#include <strophe.h>
-#endif
-
 #include "chat_session.h"
 #include "common.h"
 #include "config/preferences.h"
@@ -235,7 +228,7 @@ session_shutdown(void)
 }
 
 void
-session_process_events(int millis)
+session_process_events(void)
 {
     int reconnect_sec;
 
@@ -245,7 +238,7 @@ session_process_events(int millis)
     case JABBER_CONNECTED:
     case JABBER_CONNECTING:
     case JABBER_DISCONNECTING:
-        xmpp_run_once(connection_get_ctx(), millis);
+        connection_check_events();
         break;
     case JABBER_DISCONNECTED:
         reconnect_sec = prefs_get_reconnect();
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index f9f8d409..b883c139 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -109,7 +109,7 @@ jabber_conn_status_t session_connect_with_details(const char *const jid, const c
 jabber_conn_status_t session_connect_with_account(const ProfAccount *const account);
 void session_disconnect(void);
 void session_shutdown(void);
-void session_process_events(int millis);
+void session_process_events(void);
 char* session_get_account_name(void);
 
 jabber_conn_status_t connection_get_status(void);
diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c
index 6efcb783..064d002f 100644
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -26,7 +26,7 @@ jabber_conn_status_t session_connect_with_account(const ProfAccount * const acco
 
 void session_disconnect(void) {}
 void session_shutdown(void) {}
-void session_process_events(int millis) {}
+void session_process_events(void) {}
 const char * connection_get_fulljid(void)
 {
     return (char *)mock();