diff --git a/dix/enterleave.c b/dix/enterleave.c
index d7f5f58bc..488a94388 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -30,6 +30,7 @@
 
 #include <X11/X.h>
 #include <X11/extensions/XI2.h>
+#include "inputstr.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "exglobals.h"
diff --git a/include/windowstr.h b/include/windowstr.h
index be909b551..96bee9b93 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "miscstruct.h"
 #include <X11/Xprotostr.h>
 #include "opaque.h"
-#include "inputstr.h"
 
 #define GuaranteeNothing	0
 #define GuaranteeVisBack	1