4 files changed, 9 insertions, 8 deletions
diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 6e7dff8aa..c348b0408 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -6,6 +6,7 @@
 #define _XSERVER_DIX_COLORMAP_PRIV_H
 
 #include <X11/Xdefs.h>
+#include <X11/Xproto.h>
 
 #include "dix/screenint_priv.h"
 #include "include/colormap.h"
@@ -28,4 +29,6 @@ int CopyColormapAndFree(Colormap mid, ColormapPtr pSrc, int client);
 int AllocColor(ColormapPtr pmap, unsigned short *pred, unsigned short *pgreen,
                unsigned short *pblue, Pixel *pPix, int client );
 
+void FakeAllocColor(ColormapPtr pmap, xColorItem *item);
+
 #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index eba503d51..4ccd55eaa 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -4,12 +4,13 @@
 #endif
 
 #include <string.h>
+#include <X11/X.h>
+
+#include "dix/colormap_priv.h"
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-
-#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
@@ -19,7 +20,6 @@
 #include "mipointer.h"
 #include "randrstr.h"
 #include "xf86CursorPriv.h"
-
 #include "servermd.h"
 
 static void
diff --git a/include/colormap.h b/include/colormap.h
index 5279998f8..14cec9b91 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -74,9 +74,6 @@ typedef CARD32 Pixel;
 /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
 typedef struct _colorResource *colorResourcePtr;
 
-extern _X_EXPORT void FakeAllocColor(ColormapPtr /*pmap */ ,
-                                     xColorItem * /*item */ );
-
 extern _X_EXPORT void FakeFreeColor(ColormapPtr /*pmap */ ,
                                     Pixel /*pixel */ );
 
diff --git a/mi/misprite.c b/mi/misprite.c
index e0af13ad9..87e6fbe8e 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -35,7 +35,10 @@ in this Software without prior written authorization from The Open Group.
 
 #include   <X11/X.h>
 #include   <X11/Xproto.h>
+#include   <X11/fonts/font.h>
+#include   <X11/fonts/fontstruct.h>
 
+#include   "dix/colormap_priv.h"
 #include   "dix/dix_priv.h"
 
 #include   "misc.h"
@@ -43,7 +46,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "input.h"
 #include   "mi.h"
 #include   "cursorstr.h"
-#include   <X11/fonts/font.h>
 #include   "scrnintstr.h"
 #include   "colormapst.h"
 #include   "windowstr.h"
@@ -51,7 +53,6 @@ in this Software without prior written authorization from The Open Group.
 #include   "mipointer.h"
 #include   "misprite.h"
 #include   "dixfontstr.h"
-#include   <X11/fonts/fontstruct.h>
 #include   "inputstr.h"
 #include   "damage.h"