diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index fff854baf..47ed8ec1e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -470,29 +470,6 @@ extern _X_EXPORT unsigned int XkbStateChangedFlags(XkbStatePtr /* old */ ,
                                                    XkbStatePtr  /* new */
     );
 
-extern _X_EXPORT void XkbSendStateNotify(DeviceIntPtr /* kbd */ ,
-                                         xkbStateNotify *       /* pSN */
-    );
-
-extern _X_EXPORT void XkbSendMapNotify(DeviceIntPtr /* kbd */ ,
-                                       xkbMapNotify *   /* ev */
-    );
-
-extern _X_EXPORT int XkbComputeControlsNotify(DeviceIntPtr /* kbd */ ,
-                                              XkbControlsPtr /* old */ ,
-                                              XkbControlsPtr /* new */ ,
-                                              xkbControlsNotify * /* pCN */ ,
-                                              Bool      /* forceCtrlProc */
-    );
-
-extern _X_EXPORT void XkbSendControlsNotify(DeviceIntPtr /* kbd */ ,
-                                            xkbControlsNotify * /* ev */
-    );
-
-extern _X_EXPORT void XkbSendCompatMapNotify(DeviceIntPtr /* kbd */ ,
-                                             xkbCompatMapNotify *       /* ev */
-    );
-
 extern _X_EXPORT void XkbHandleBell(BOOL force,
                                     BOOL eventOnly,
                                     DeviceIntPtr kbd,
@@ -504,24 +481,6 @@ extern _X_EXPORT void XkbHandleBell(BOOL force,
                                     ClientPtr pClient
     );
 
-extern _X_EXPORT void XkbSendNamesNotify(DeviceIntPtr /* kbd */ ,
-                                         xkbNamesNotify *       /* ev */
-    );
-
-extern _X_EXPORT void XkbSendActionMessage(DeviceIntPtr /* kbd */ ,
-                                           xkbActionMessage *   /* ev */
-    );
-
-extern _X_EXPORT void XkbSendExtensionDeviceNotify(DeviceIntPtr /* kbd */ ,
-                                                   ClientPtr /* client */ ,
-                                                   xkbExtensionDeviceNotify *   /* ev */
-    );
-
-extern _X_EXPORT void XkbSendNotification(DeviceIntPtr /* kbd */ ,
-                                          XkbChangesPtr /* pChanges */ ,
-                                          XkbEventCausePtr      /* cause */
-    );
-
 extern _X_EXPORT void XkbProcessKeyboardEvent(DeviceEvent * /* event */ ,
                                               DeviceIntPtr      /* keybd */
     );
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 9edf86da6..39f4d56e0 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -156,4 +156,19 @@ void XkbSetRulesDflts(XkbRMLVOSet *rmlvo);
 void XkbDeleteRulesDflts(void);
 void XkbDeleteRulesUsed(void);
 
+/* notification sending */
+void XkbSendStateNotify(DeviceIntPtr kbd, xkbStateNotify *pSN);
+void XkbSendMapNotify(DeviceIntPtr kbd, xkbMapNotify *ev);
+int XkbComputeControlsNotify(DeviceIntPtr kbd, XkbControlsPtr old,
+                             XkbControlsPtr new, xkbControlsNotify *pCN,
+                             Bool forceCtrlProc);
+void XkbSendControlsNotify(DeviceIntPtr kbd, xkbControlsNotify *ev);
+void XkbSendCompatMapNotify(DeviceIntPtr kbd, xkbCompatMapNotify *ev);
+void XkbSendNamesNotify(DeviceIntPtr kbd, xkbNamesNotify *ev);
+void XkbSendActionMessage(DeviceIntPtr kbd, xkbActionMessage *ev);
+void XkbSendExtensionDeviceNotify(DeviceIntPtr kbd, ClientPtr client,
+                                  xkbExtensionDeviceNotify *ev);
+void XkbSendNotification(DeviceIntPtr kbd, XkbChangesPtr pChanges,
+                         XkbEventCausePtr cause);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */