diff --git a/src/include/compositor-clutter.h b/src/include/compositor-clutter.h
index 7f79469be..62754ccf7 100644
--- a/src/include/compositor-clutter.h
+++ b/src/include/compositor-clutter.h
@@ -26,6 +26,7 @@
 #define META_COMPOSITOR_CLUTTER_H_
 
 #include <clutter/clutter.h>
+#include <xlib/xlib.h>
 
 #include "types.h"
 
diff --git a/src/include/compositor-mutter.h b/src/include/compositor-mutter.h
index 85645ae53..083ab1993 100644
--- a/src/include/compositor-mutter.h
+++ b/src/include/compositor-mutter.h
@@ -26,8 +26,10 @@
 #define MUTTER_H_
 
 #include <clutter/clutter.h>
+#include <X11/Xlib.h>
 
 #include "types.h"
+#include "compositor.h"
 
 /*
  * MutterWindow object (ClutterGroup sub-class)
diff --git a/src/include/mutter-plugin.h b/src/include/mutter-plugin.h
index 427f24c72..e85760dc6 100644
--- a/src/include/mutter-plugin.h
+++ b/src/include/mutter-plugin.h
@@ -30,6 +30,7 @@
 
 #include <clutter/clutter.h>
 #include <X11/extensions/Xfixes.h>
+#include <gmodule.h>
 
 /*
  * This file defines the plugin API.