diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f9978078c..e98db459b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -52,6 +52,7 @@
 
 #include "dix/resource_priv.h"
 #include "dix/screensaver_priv.h"
+#include "include/extinit.h"
 #include "os/log_priv.h"
 #include "os/osdep.h"
 #include "xkb/xkbsrv_priv.h"
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index e183f04ad..f59c00887 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -52,6 +52,7 @@
 #include "dix/exevents_priv.h"
 #include "dix/request_priv.h"
 #include "dix/screen_hooks_priv.h"
+#include "include/extinit.h"
 #include "mi/mi_priv.h"
 
 #include "xf86.h"
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 7a654fcf4..382e60132 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -43,6 +43,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
+#include "include/extinit.h"
 #include "mi/mi_priv.h"
 #include "os/log_priv.h"
 #include "os/osdep.h"
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 0aa4ea3e0..a727021d0 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -86,6 +86,7 @@
 
 #include <X11/X.h>
 
+#include "include/extinit.h"
 #include "os/log_priv.h"
 
 #include "xf86Modes.h"
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 98136bd4f..baead10be 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -29,6 +29,7 @@
 
 #include "dix/input_priv.h"
 #include "dix/screen_hooks_priv.h"
+#include "include/extinit.h"
 
 #include "os.h"
 #include "globals.h"
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 444fde7e5..56ea4d2ee 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -38,6 +38,7 @@
 #include <X11/extensions/Xvproto.h>
 
 #include "dix/screen_hooks_priv.h"
+#include "include/extinit.h"
 #include "Xext/xvdix_priv.h"
 
 #include "misc.h"
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index e657cb79f..69c3685b9 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -38,6 +38,7 @@
 #include <X11/Xproto.h>
 
 #include "dix/screen_hooks_priv.h"
+#include "include/extinit.h"
 
 #include "scrnintstr.h"
 #include "resource.h"
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 6d7e40f73..b6e0529c2 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -50,6 +50,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dix/dix_priv.h"
 #include "dix/screen_hooks_priv.h"
 #include "dix/screenint_priv.h"
+#include "include/extinit.h"
 
 #include "xf86.h"
 #include "xf86drm.h"
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 8b28972f8..7f86e8374 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -41,6 +41,7 @@
 
 #include "dix/dix_priv.h"
 #include "dix/request_priv.h"
+#include "include/extinit.h"
 
 #include "dixstruct.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 9aaa03d54..39b1b625d 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -29,6 +29,7 @@
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "dix/screenint_priv.h"
+#include "include/extinit.h"
 
 #include "xf86.h"
 #include "os.h"