diff --git a/src/cfgfile.c b/src/cfgfile.c
index 85c1c9d8..30bc55e8 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -28,6 +28,7 @@
 
 #include "common/thread/thread.h"
 #include "cfgfile.h"
+#include "global.h"
 #include "refbuf.h"
 #include "client.h"
 #include "logging.h"
diff --git a/src/cfgfile.h b/src/cfgfile.h
index 9a2db124..e339a19e 100644
--- a/src/cfgfile.h
+++ b/src/cfgfile.h
@@ -27,7 +27,7 @@ struct _mount_proxy;
 #include <libxml/tree.h>
 #include "common/thread/thread.h"
 #include "common/avl/avl.h"
-#include "global.h"
+#include "slave.h"
 #include "connection.h"
 
 #define XMLSTR(str) ((xmlChar *)(str)) 
diff --git a/src/client.c b/src/client.c
index 67ec5feb..18288f6a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -28,6 +28,7 @@
 #include "common/avl/avl.h"
 #include "common/httpp/httpp.h"
 
+#include "global.h"
 #include "cfgfile.h"
 #include "connection.h"
 #include "refbuf.h"
diff --git a/src/event_exec.c b/src/event_exec.c
index 0ce34fbb..488c88a9 100644
--- a/src/event_exec.c
+++ b/src/event_exec.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "event.h"
+#include "global.h"
 #include "logging.h"
 #define CATMODULE "event_exec"
 
diff --git a/src/global.h b/src/global.h
index c257359f..12013a63 100644
--- a/src/global.h
+++ b/src/global.h
@@ -21,6 +21,7 @@
 #define ICECAST_VERSION_STRING "Icecast " PACKAGE_VERSION
 
 #include "common/thread/thread.h"
+#include "common/avl/avl.h"
 #include "slave.h"
 #include "common/net/sock.h"
 
diff --git a/src/yp.c b/src/yp.c
index 923751a2..3effbe9d 100644
--- a/src/yp.c
+++ b/src/yp.c
@@ -21,6 +21,7 @@
 
 #include "common/thread/thread.h"
 
+#include "global.h"
 #include "curl.h"
 #include "connection.h"
 #include "refbuf.h"