diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 4bb6ae360..ef7f16dff 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -41,6 +41,7 @@
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "os/fmt.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "windowstr.h"          /* window structure  */
@@ -49,10 +50,6 @@
 #include "scrnintstr.h"
 #include "xkbsrv.h"
 
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 #include "inpututils.h"
 #include "xiquerypointer.h"