diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 8a9592314..1c07c2eff 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -6,7 +6,13 @@
 #ifndef _XSERVER_XKBSRV_PRIV_H_
 #define _XSERVER_XKBSRV_PRIV_H_
 
+#include <X11/Xdefs.h>
+#include <X11/Xmd.h>
+
+#include "dix.h"
+#include "input.h"
 #include "xkbsrv.h"
+#include "xkbstr.h"
 
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);