diff --git a/composite/compinit.c b/composite/compinit.c
index e0a565365..5b59bb3fb 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -43,6 +43,7 @@
 
 #include <dix-config.h>
 
+#include "dix/colormap_priv.h"
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
 
diff --git a/dix/colormap_priv.h b/dix/colormap_priv.h
index 04a55b07a..b76fd2b34 100644
--- a/dix/colormap_priv.h
+++ b/dix/colormap_priv.h
@@ -59,4 +59,7 @@ int StoreColors(ColormapPtr pmap, int count, xColorItem * defs, ClientPtr client
 
 int IsMapInstalled(Colormap map, WindowPtr pWin);
 
+/* only exported for glx, but should not be used by external drivers */
+_X_EXPORT Bool ResizeVisualArray(ScreenPtr pScreen, int new_vis_count, DepthPtr depth);
+
 #endif /* _XSERVER_DIX_COLORMAP_PRIV_H */
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index ef969fcd6..c2740a424 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -30,8 +30,11 @@
 
 #include <dix-config.h>
 
-#include <GL/glxtokens.h>
 #include <string.h>
+#include <GL/glxtokens.h>
+
+#include "dix/colormap_priv.h"
+
 #include <windowstr.h>
 #include <os.h>
 #include <colormapst.h>
diff --git a/include/colormap.h b/include/colormap.h
index 216a4c932..48ae0d649 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -55,8 +55,4 @@ SOFTWARE.
 
 typedef CARD32 Pixel;
 
-extern _X_EXPORT Bool ResizeVisualArray(ScreenPtr /* pScreen */ ,
-                                        int /* new_vis_count */ ,
-                                        DepthPtr /* depth */ );
-
 #endif                          /* CMAP_H */