3 files changed, 5 insertions, 6 deletions

diff --git a/dix/getevents.c b/dix/getevents.c
index 19e6fa7cf..f53f3c347 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -62,10 +62,6 @@
 #include "extnsionst.h"
 #include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
 
-/* Maximum number of valuators, divided by six, rounded up, to get number
- * of events. */
-#define MAX_VALUATOR_EVENTS 6
-
 /* Number of motion history events to store. */
 #define MOTION_HISTORY_SIZE 256
 
diff --git a/include/input.h b/include/input.h
index 509ce3cff..e14f698e7 100644
--- a/include/input.h
+++ b/include/input.h
@@ -69,7 +69,10 @@ SOFTWARE.
 #define PtrAccelLightweight     2
 #define PtrAccelDefault         PtrAccelPredictable
 
-#define MAX_VALUATORS 36 /* XXX from comment in dix/getevents.c */
+#define MAX_VALUATORS 36
+/* Maximum number of valuators, divided by six, rounded up, to get number
+ * of events. */
+#define MAX_VALUATOR_EVENTS 6
 
 #define NO_AXIS_LIMITS -1
 
diff --git a/mi/mieq.c b/mi/mieq.c
index aef6fae89..a05c9eb1b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -93,7 +93,7 @@ mieqInit(void)
         miEventQueue.handlers[i] = NULL;
     for (i = 0; i < QUEUE_SIZE; i++)
     {
-        EventListPtr evlist = InitEventList(7); /* 1 + MAX_VALUATOR_EVENTS */
+        EventListPtr evlist = InitEventList(1 + MAX_VALUATOR_EVENTS);
         if (!evlist)
             FatalError("Could not allocate event queue.\n");
         miEventQueue.events[i].events = evlist;