diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 4f3cf7c1e..d7ddee8ff 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -211,30 +211,6 @@ typedef struct {
     DeviceUnwrapProc unwrapProc;
 } xkbDeviceInfoRec, *xkbDeviceInfoPtr;
 
-#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
-	if (device->public.processInputProc == device->public.realInputProc)\
-	    device->public.processInputProc = proc; \
-	oldprocs->processInputProc = \
-	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
-	oldprocs->unwrapProc = device->unwrapProc; \
-	device->unwrapProc = unwrapproc;
-
-#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
-        backupproc = device->public.realInputProc; \
-	if (device->public.processInputProc == device->public.realInputProc)\
-	    device->public.processInputProc = oldprocs->realInputProc; \
-	device->public.realInputProc = oldprocs->realInputProc; \
-	device->unwrapProc = oldprocs->unwrapProc;
-
 extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec;
 
 #define xkbDevicePrivateKey (&xkbDevicePrivateKeyRec)
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 3100a0d74..52f90ee80 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -66,6 +66,30 @@
 #define _XkbErrCode3(a,b,c)     _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
 #define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
 
+#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
+        device->public.processInputProc = proc; \
+        oldprocs->processInputProc = \
+        oldprocs->realInputProc = device->public.realInputProc; \
+        device->public.realInputProc = proc; \
+        oldprocs->unwrapProc = device->unwrapProc; \
+        device->unwrapProc = unwrapproc;
+
+#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
+        if (device->public.processInputProc == device->public.realInputProc)\
+            device->public.processInputProc = proc; \
+        oldprocs->processInputProc = \
+        oldprocs->realInputProc = device->public.realInputProc; \
+        device->public.realInputProc = proc; \
+        oldprocs->unwrapProc = device->unwrapProc; \
+        device->unwrapProc = unwrapproc;
+
+#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
+        backupproc = device->public.realInputProc; \
+        if (device->public.processInputProc == device->public.realInputProc)\
+            device->public.processInputProc = oldprocs->realInputProc; \
+        device->public.realInputProc = oldprocs->realInputProc; \
+        device->unwrapProc = oldprocs->unwrapProc;
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);