diff --git a/Makefile.am b/Makefile.am
index c3c33feb..d71c7930 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ profanity_SOURCES = src/command.c src/contact.c src/command_history.c \
 	src/accounts.c src/accounts.h src/jid.h src/jid.c \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
 	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
-	src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h \
+	src/xmpp/stanza.h src/xmpp/message.h src/xmpp/iq.h src/xmpp/presence.h \
 	src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/windows.c \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c
 
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index aa0705e1..9d6f6822 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -38,6 +38,7 @@
 #include "stanza.h"
 #include "message.h"
 #include "iq.h"
+#include "presence.h"
 
 static struct _jabber_conn_t {
     xmpp_log_t *log;
diff --git a/src/xmpp/presence.h b/src/xmpp/presence.h
new file mode 100644
index 00000000..e3ede7f1
--- /dev/null
+++ b/src/xmpp/presence.h
@@ -0,0 +1,30 @@
+/*
+ * presence.h
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PRESENCE_H
+#define PRESENCE_H
+
+void presence_add_handlers(void);
+void presence_init(void);
+void presence_free_sub_requests(void);
+
+#endif
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index ca2e2a48..428908cf 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -82,11 +82,8 @@ void message_send_paused(const char * const recipient);
 void message_send_gone(const char * const recipient);
 
 // presence functions
-void presence_add_handlers(void);
-void presence_init(void);
 void presence_subscription(const char * const jid, const jabber_subscr_t action);
 GList* presence_get_subscription_requests(void);
-void presence_free_sub_requests(void);
 void presence_join_room(Jid *jid);
 void presence_change_room_nick(const char * const room, const char * const nick);
 void presence_leave_chat_room(const char * const room_jid);