diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 08771759b..6af6d17d2 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -10,6 +10,7 @@
 
 #include "dix/screenint_priv.h"
 #include "include/colormap.h"
+#include "include/dix.h"
 #include "include/window.h"
 
 typedef struct _CMEntry *EntryPtr;
@@ -33,4 +34,7 @@ void FakeAllocColor(ColormapPtr pmap, xColorItem *item);
 
 void FakeFreeColor(ColormapPtr pmap, Pixel pixel);
 
+int QueryColors(ColormapPtr pmap, int count, Pixel *ppixIn,
+                xrgb *prgbList, ClientPtr client);
+
 #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index c82295eb8..4ebd8b058 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -38,6 +38,7 @@ from The Open Group.
 #include <X11/Xproto.h>
 #include <X11/Xos.h>
 
+#include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/cmdline.h"
diff --git a/include/colormap.h b/include/colormap.h
index 4c21475ca..9368b356d 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -74,12 +74,6 @@ typedef CARD32 Pixel;
 /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
 typedef struct _colorResource *colorResourcePtr;
 
-extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
-                                 int /*count */ ,
-                                 Pixel * /*ppixIn */ ,
-                                 xrgb * /*prgbList */ ,
-                                 ClientPtr client);
-
 extern _X_EXPORT int FreeClientPixels(void *pcr,
                                       XID fakeid);