Revert "xfree86: modes: move private definitions out of from xf86RandR12.h"

This reverts commit ac5e95be49.

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

hw/xfree86/common/xf86cmap.c

@@ -47,7 +47,7 @@
 #include "xf86_OSproc.h"
 #include "xf86str.h"
 #include "micmap.h"
-#include "xf86RandR12_priv.h"
+#include "xf86RandR12.h"
 #include "xf86Crtc.h"
 
 #ifdef XFreeXDGA

hw/xfree86/modes/xf86RandR12.c

@@ -42,7 +42,7 @@
 
 #include "xf86cmap.h"
 #include "xf86Crtc.h"
-#include "xf86RandR12_priv.h"
+#include "xf86RandR12.h"
 
 typedef struct _xf86RandR12Info {
     int virtualX;

hw/xfree86/modes/xf86RandR12.h

@@ -40,4 +40,9 @@ extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn,
 extern _X_EXPORT Bool xf86RandR12PreInit(ScrnInfoPtr pScrn);
 extern _X_EXPORT void xf86RandR12TellChanged(ScreenPtr pScreen);
 
+extern void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
+                                   int *indices, LOCO *colors,
+                                   VisualPtr pVisual);
+extern Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
+
 #endif                          /* _XF86_RANDR_H_ */

hw/xfree86/modes/xf86RandR12_priv.h

@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: MIT OR X11
- *
- * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
- */
-#ifndef _XSERVER_XF86RANDR12_PRIV_H_
-#define _XSERVER_XF86RANDR12_PRIV_H_
-
-#include <X11/extensions/render.h>
-
-#include "randrstr.h"
-#include "xf86RandR12.h"
-
-void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
-                            int *indices, LOCO *colors,
-                            VisualPtr pVisual);
-Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
-
-#endif /* _XSERVER_XF86RANDR12_PRIV_H_ */