diff --git a/src/event/common.h b/src/event/common.h
index 34e56821..001e0dd7 100644
--- a/src/event/common.h
+++ b/src/event/common.h
@@ -36,6 +36,8 @@
 #ifndef EVENT_COMMON_H
 #define EVENT_COMMON_H
 
+#include "glib.h"
+
 void ev_disconnect_cleanup(void);
 void ev_inc_connection_counter(void);
 void ev_reset_connection_counter(void);
diff --git a/src/pgp/gpg.h b/src/pgp/gpg.h
index d1cff52e..5660d1cb 100644
--- a/src/pgp/gpg.h
+++ b/src/pgp/gpg.h
@@ -36,6 +36,8 @@
 #ifndef PGP_GPG_H
 #define PGP_GPG_H
 
+#include "glib.h"
+
 typedef struct pgp_key_t
 {
     char* id;
diff --git a/src/tools/bookmark_ignore.h b/src/tools/bookmark_ignore.h
index 5724ea2b..e52e128a 100644
--- a/src/tools/bookmark_ignore.h
+++ b/src/tools/bookmark_ignore.h
@@ -36,6 +36,8 @@
 #ifndef BOOKMARK_IGNORE_H
 #define BOOKMARK_IGNORE_H
 
+#include "xmpp/xmpp.h"
+
 void bookmark_ignore_on_connect();
 void bookmark_ignore_on_disconnect();
 gboolean bookmark_ignored(Bookmark* bookmark);
diff --git a/src/ui/titlebar.h b/src/ui/titlebar.h
index 50408454..7e22d9ae 100644
--- a/src/ui/titlebar.h
+++ b/src/ui/titlebar.h
@@ -36,6 +36,8 @@
 #ifndef UI_TITLEBAR_H
 #define UI_TITLEBAR_H
 
+#include "glib.h"
+
 void create_title_bar(void);
 void free_title_bar(void);
 void title_bar_update_virtual(void);
diff --git a/src/xmpp/blocking.h b/src/xmpp/blocking.h
index ff09f21b..b485e291 100644
--- a/src/xmpp/blocking.h
+++ b/src/xmpp/blocking.h
@@ -36,6 +36,8 @@
 #ifndef XMPP_BLOCKING_H
 #define XMPP_BLOCKING_H
 
+#include <strophe.h>
+
 void blocking_request(void);
 int blocked_set_handler(xmpp_stanza_t* stanza);
 
diff --git a/src/xmpp/iq.h b/src/xmpp/iq.h
index 13192780..817bb3db 100644
--- a/src/xmpp/iq.h
+++ b/src/xmpp/iq.h
@@ -36,6 +36,8 @@
 #ifndef XMPP_IQ_H
 #define XMPP_IQ_H
 
+#include <strophe.h>
+
 typedef int (*ProfIqCallback)(xmpp_stanza_t* const stanza, void* const userdata);
 typedef void (*ProfIqFreeCallback)(void* userdata);
 
diff --git a/src/xmpp/ox.h b/src/xmpp/ox.h
index 06acd119..f2980cfb 100644
--- a/src/xmpp/ox.h
+++ b/src/xmpp/ox.h
@@ -33,6 +33,8 @@
  *
  */
 
+#include "glib.h"
+
 /*!
  * \page OX OX Implementation
  *
diff --git a/src/xmpp/roster.h b/src/xmpp/roster.h
index 253e088d..866a5b88 100644
--- a/src/xmpp/roster.h
+++ b/src/xmpp/roster.h
@@ -36,6 +36,9 @@
 #ifndef XMPP_ROSTER_H
 #define XMPP_ROSTER_H
 
+#include "glib.h"
+#include <strophe.h>
+
 void roster_request(void);
 void roster_set_handler(xmpp_stanza_t* const stanza);
 void roster_result_handler(xmpp_stanza_t* const stanza);
diff --git a/src/xmpp/vcard_funcs.h b/src/xmpp/vcard_funcs.h
index 5f4aa3d0..91913547 100644
--- a/src/xmpp/vcard_funcs.h
+++ b/src/xmpp/vcard_funcs.h
@@ -38,6 +38,7 @@
 
 #include "ui/win_types.h"
 #include "xmpp/vcard.h"
+#include <strophe.h>
 
 vCard* vcard_new();
 void vcard_free(vCard* vcard);