diff --git a/Xi/allowev.c b/Xi/allowev.c
index 74e4ae214..1700e72d0 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -57,6 +57,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/input_priv.h"
 
 #include "exglobals.h"
 #include "allowev.h"
diff --git a/dix/input_priv.h b/dix/input_priv.h
index 5a93a68d1..1694bd1af 100644
--- a/dix/input_priv.h
+++ b/dix/input_priv.h
@@ -293,6 +293,19 @@ void ActivateGrabNoDelivery(DeviceIntPtr dev,
                             GrabPtr grab,
                             InternalEvent *event,
                             InternalEvent *real_event);
+
+/* states for device grabs */
+
+#define NOT_GRABBED             0
+#define THAWED                  1
+#define THAWED_BOTH             2       /* not a real state */
+#define FREEZE_NEXT_EVENT       3
+#define FREEZE_BOTH_NEXT_EVENT  4
+#define FROZEN                  5       /* any state >= has device frozen */
+#define FROZEN_NO_EVENT         5
+#define FROZEN_WITH_EVENT       6
+#define THAW_OTHERS             7
+
 /**
  * Masks specifying the type of event to deliver for an InternalEvent; used
  * by EventIsDeliverable.
diff --git a/include/inputstr.h b/include/inputstr.h
index 3022944c1..6ed2d928d 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -499,18 +499,6 @@ typedef struct _XIPropertyHandler {
     int (*DeleteProperty) (DeviceIntPtr dev, Atom property);
 } XIPropertyHandler, *XIPropertyHandlerPtr;
 
-/* states for devices */
-
-#define NOT_GRABBED		0
-#define THAWED			1
-#define THAWED_BOTH		2       /* not a real state */
-#define FREEZE_NEXT_EVENT	3
-#define FREEZE_BOTH_NEXT_EVENT	4
-#define FROZEN			5       /* any state >= has device frozen */
-#define FROZEN_NO_EVENT		5
-#define FROZEN_WITH_EVENT	6
-#define THAW_OTHERS		7
-
 typedef struct _GrabInfoRec {
     TimeStamp grabTime;
     Bool fromPassiveGrab;       /* true if from passive grab */