diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 83a1a6592..83bc411af 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -47,6 +47,7 @@
 #endif
 #include "xf86Xinput.h"
 #include "exglobals.h"
+#include "exevents.h"
 
 #include "mi.h"
 
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index d4040481c..f99bfb700 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -62,6 +62,7 @@
 #include "mipointer.h"
 #include "xf86InPriv.h"
 #include "compiler.h"
+#include "extinit.h"
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
@@ -89,6 +90,10 @@
 #include "dgaproc.h"
 #endif
 
+#ifdef XKB
+#include "xkbsrv.h"
+#endif
+
 #include "os.h"
 
 EventListPtr xf86Events = NULL;