1 files changed, 9 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index d6cb109ea..b37d5cf67 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -36,6 +36,13 @@
 #endif
 #include "win.h"
 
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
 #include "inputstr.h"
 #include "exevents.h" /* for button/axes labels */
 #include "xserver-properties.h"
@@ -88,7 +95,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
        */
       if (lngMouseButtons < 3)
         lngMouseButtons = 3;
-      winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons);
+      winDebug("%d mouse buttons found\n", lngMouseButtons);
 
       /* allocate memory: 
        * number of buttons + 2x mouse wheel event + 1 extra (offset for map) 
@@ -246,10 +253,8 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
   for (i = 0; i < nevents; i++)
     mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event);
 
-#if CYGDEBUG
-  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
+  winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
           iEventType, iButton, nevents);
-#endif
 }