Revert "xkb: unexport XkbRF_GetComponents()"

This reverts commit d3b328ba4a.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046>

include/xkbrules.h

@@ -80,6 +80,14 @@ typedef struct _XkbRF_Rules {
 
 _XFUNCPROTOBEGIN
 
+/* Seems preferable to dragging xkbstr.h in. */
+    struct _XkbComponentNames;
+
+extern _X_EXPORT Bool XkbRF_GetComponents(XkbRF_RulesPtr /* rules */ ,
+                                          XkbRF_VarDefsPtr /* var_defs */ ,
+                                          struct _XkbComponentNames *   /* names */
+    );
+
 extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ ,
                                       XkbRF_RulesPtr    /* rules */
     );

xkb/ddxLoad.c

@@ -42,7 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "os/osdep.h"
 #include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
-#include "xkb/xkbrules_priv.h"
 
 #include "inputstr.h"
 #include "scrnintstr.h"

xkb/maprules.c

@@ -40,9 +40,6 @@
 #include <X11/Xfuncs.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-
-#include "xkb/xkbrules_priv.h"
-
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"

xkb/xkbrules_priv.h

@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef _XSERVER_XKB_XKBRULES_PRIV_H
-#define _XSERVER_XKB_XKBRULES_PRIV_H
-
-#include <X11/Xdefs.h>
-
-#include "include/xkbrules.h"
-
-struct _XkbComponentNames;
-
-Bool XkbRF_GetComponents(XkbRF_RulesPtr rules,
-                         XkbRF_VarDefsPtr var_defs,
-                         struct _XkbComponentNames *names);
-
-#endif /* _XSERVER_XKB_XKBRULES_PRIV_H */