diff --git a/composite/compinit.c b/composite/compinit.c
index c29a896c12..61b547c50b 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -46,6 +46,7 @@
 #include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
+#include "include/extinit.h"
 #include "os/osdep.h"
 
 #include "compint.h"
diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index a976c5d8e0..edc5ae2c27 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -44,9 +44,9 @@
 #include <dix-config.h>
 #include <X11/Xmd.h>
 
-#include "Xext/panoramiXsrv.h"
-
 #include "dix/window_priv.h"
+#include "include/extinit.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "compint.h"
 #include "xace.h"
diff --git a/composite/compwindow.c b/composite/compwindow.c
index ca789654ff..73008f3750 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -45,6 +45,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
+#include "include/extinit.h"
 #include "os/osdep.h"
 #include "Xext/panoramiXsrv.h"